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

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 4c89f36..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
@@ -241,11 +241,11 @@ run_actions() {
 what_upgrade () {
   local IFSOLD name version package
 
-  for package in `echo "$needed_woody_versions" | awk '{print $1}'| grep -v ^$`; do
+  for package in `echo "$needed_versions" | awk '{print $1}'| grep -v ^$`; do
     IFSOLD="$IFS"
     IFS="	" # tab
     read name version <<-EOPTS
-	$(echo "$needed_woody_versions" | sed 's/		*/	/g' | grep ^$package)
+	$(echo "$needed_versions" | sed 's/		*/	/g' | grep ^$package)
 	EOPTS
     IFS="$IFSOLD"
     if pkg "$name" lt "$version"; then
@@ -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
 }