synfigstudio-cph-monitor: display version correctly if built on (no branch).

[synfig.git] / synfig-studio / trunk / synfigstudio-cph-monitor

diff --git a/synfig-studio/trunk/synfigstudio-cph-monitor b/synfig-studio/trunk/synfigstudio-cph-monitor
index 02fc18a..57ad242 100755 (executable)
--- a/synfig-studio/trunk/synfigstudio-cph-monitor
+++ b/synfig-studio/trunk/synfigstudio-cph-monitor
@@ -17,6 +17,8 @@ trap writelog INT
 
 init()
 {
+echo "Synfig Crash Monitor is a tool to collect statistics about synfig crashes. All information is collected locally in ~/.synfig/cph directory."
+echo
 echo `date +%H:%M` "Synfig Crash Monitor started."
 STARTED=0
 RUNTIME=0
@@ -105,16 +107,15 @@ mainloop()
                                if [ ! -e $P ]; then
                                        P=`which $P`
                                fi
-                               echo $P
                                P=`dirname $P`
-                               echo "   Assuming synfig installed in $P."
                                VERSION=`$P/synfig --info|head -n 1|cut -d '-' -f 2`
                                RELEASE=`$P/synfig --info|egrep "Development version:"|cut -d ' ' -f 3`
-                               BRANCH=`$P/synfig --info|egrep "Branch:"|cut -d ' ' -f 2`
+                               BRANCH=`$P/synfig --info|egrep "Branch:"|cut -d ' ' -f 2-3`
                                if [[ $BRANCH == '(no branch)' ]]; then
                                        BRANCH=`$P/synfig --info|egrep "Revision ID:"|cut -d ' ' -f 3`
                                fi
                                echo `date +%H:%M` "Synfig $VERSION.$RELEASE.$BRANCH started."
+                               echo `date +%H:%M` "Assuming Synfig installed in $P."
                        else
                                let RUNTIME=$RUNTIME+1
                        fi