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
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
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:
/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
}