From: Valentin Vidic Date: Fri, 7 Mar 2008 15:21:03 +0000 (+0100) Subject: Localized all function variables. X-Git-Tag: debian/4.0.1~28 X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=45c30989728af6d256fe40cbb16ebdbd672b5bc5;p=carnet-upgrade.git Localized all function variables. --- diff --git a/src/functions.sh b/src/functions.sh index 68996bc..22ba7a6 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -28,7 +28,7 @@ log() { # find first free uid/gid in range # find_id passwd 100 999 find_id() { - local db first last ids + local i db first last ids db=$1 first=$2 last=$3 @@ -129,8 +129,8 @@ dist_upgrade () { } remove_bloat() { - local to_remove add_this i j text to_show cmd tmpfile installed - local update_selections pkgs_to_deselect oldifs + local to_remove add_this i j n text to_show cmd tmpfile installed + local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist text="$msg_remove_bloat" [ "$DEBUG" ] && set -x @@ -202,7 +202,7 @@ run_post_upgrade() { ### run_actions() { - local line lineno lineno2 f n name action testmsg + local line lineno lineno2 f n name action checkmsg check [ "$DEBUG" ] && set -vx name="$1" f="$2" @@ -226,16 +226,16 @@ run_actions() { lineno2=$(($lineno2+1)) line=$(echo -n "$line"| sed 's/\\$//'; head -$lineno2 "$f" | tail -1) done - test=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}') + check=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}') action=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $2}') - testmsg="" - [ "$test" != "true" ] && testmsg="if '$test'" + checkmsg="" + [ "$test" != "true" ] && checkmsg="if '$test'" if eval $test; then - log "$(printf 'action %02d' $lineno) starting: '${action}' $testmsg " + log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg " eval $action - log "$(printf 'action %02d' $lineno) finished: '${action}' $testmsg" + log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg" else - log "$(printf 'action %02d' $lineno) skipping: '${action}' $testmsg" + log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg" fi [ "$lineno2" -gt "$lineno" ] && lineno=$lineno2 done @@ -298,7 +298,7 @@ Nakon toga ponovno pozovite ovu skriptu." } upgrade () { - local to_install packages + local i to_install packages case "$1" in first) packages="$packages_first" @@ -488,6 +488,8 @@ restore_config () { # restore modified config to their package defaults # so the upgrade doesn't complain so much restore_configs () { + local config_backup + pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net pkg bind9 lt 1:9.3.4 && restore_config /etc/bind/named.conf.options pkg libpam-modules lt 0.79 && restore_config /etc/security/limits.conf @@ -593,6 +595,7 @@ upgrade_libc () { # upgrade apache -> apache2 upgrade_apache () { + local delpkg p # bugfix for apache2-cn postinst mkdir -p /etc/apache2 @@ -625,6 +628,8 @@ upgrade_apache () { } upgrade_amavis () { + local conf + # remove init script diversion if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then rm -vf /etc/init.d/amavis @@ -632,7 +637,7 @@ upgrade_amavis () { fi # move old config aside - local conf=/etc/amavis/amavisd.conf + conf=/etc/amavis/amavisd.conf if [ -e $conf -a ! -e $conf.$backup_ext ]; then mv -v $conf $conf.$backup_ext fi @@ -659,8 +664,7 @@ upgrade_openldap () { } get_variable () { - name=$1 - file=$2 + local name=$1 file=$2 val if [ -f "$file" ]; then val=$(sed -n "/^[[:space:]]*$name[[:space:]]*=/s/[[:space:]]*//gp" $file)