X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Ffunctions.sh;fp=usr%2Fshare%2Fcarnet-upgrade%2Ffunctions.sh;h=3c179a19e7ab2135c2bbe0b8f2a9d51b80608869;hb=537d173be1b7f9bea2e605b026b762ddd3e7d268;hp=4388ae6115786c161e772d02d25ca72c8e580093;hpb=91a2e67f6fb3d9e3f70ab53d6ad0089605e4b10d;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 4388ae6..3c179a1 100644
--- a/usr/share/carnet-upgrade/functions.sh
+++ b/usr/share/carnet-upgrade/functions.sh
@@ -225,11 +225,11 @@ run_actions() {
     test=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $1}')
     action=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $2}')
     if eval $test; then
-      log "$(printf '%02d' $lineno) starting ${action}(), (test $test passed)"
+      log "$(printf 'action %02d' $lineno) starting: '${action}' if '$test'"
       eval $action
-      log "$(printf '%02d' $lineno) finished ${action}()"
+      log "$(printf 'action %02d' $lineno) finished: '${action}'"
     else
-      log "$(printf '%02d' $lineno) skipping ${action}(), (test $test failed)"
+      log "$(printf 'action %02d' $lineno) skipping: '${action}' if '$test'"
     fi
     [ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
   done