Changed logging format.

[carnet-upgrade.git] / usr / share / carnet-upgrade / functions.sh

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 7fb574e..3c179a1 100644 (file)
--- 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
@@ -261,7 +261,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian Sarge potrebno je napraviti upgrade ovih paketa:
+Prije prelaska na Debian Etch potrebno je napraviti upgrade ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -519,10 +519,10 @@ fix_smtp_auth() {
   /etc/init.d/sendmail reload || true
 }
 
-sarge_sources_list() {
-  if [ ! -e /var/lib/carnet-upgrade/stamp-sarge_sources_list ]; then
+sources_list() {
+  if [ ! -e /var/lib/carnet-upgrade/stamp-sources_list ]; then
     install-carnet-sources.list
     apt-get -y update
-    touch /var/lib/carnet-upgrade/stamp-sarge_sources_list
+    touch /var/lib/carnet-upgrade/stamp-sources_list
   fi
 }