X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fcn-upgrade;h=fa468755129642984765a03e5ee87d4d13391b7a;hb=117f701749f5a01a2e423ee36651a32db7d1e1f7;hp=4fb7fd66e8587d190116e0547a832167b54f47ab;hpb=2e767d4b5b56762a785df22c2cc0de7d63aa3cff;p=carnet-upgrade.git diff --git a/src/cn-upgrade b/src/cn-upgrade index 4fb7fd6..fa46875 100755 --- a/src/cn-upgrade +++ b/src/cn-upgrade @@ -1,15 +1,15 @@ -#!/bin/sh +#!/bin/bash # last update: 2005-01-07 # Zoran 'jelly' Dzelajlija # Ivan 'ico' Rako -version="carnet-upgrade v4.0.0" +version="carnet-upgrade v4.0.6" # restart upgrade under script for logging purposes if [ "$1" == "--no-script" ]; then shift elif [ -x /usr/bin/script ]; then - exec /usr/bin/script -a -c "$0 --no-script $@" \ - /var/log/carnet-upgrade.typescript + exec /usr/bin/script -a -t -f -c "$0 --no-script $@" \ + /var/log/carnet-upgrade.typescript 2>>/var/log/carnet-upgrade.timing fi set -e @@ -29,6 +29,8 @@ cnup="/usr/share/carnet-upgrade" . ${ROOT}${cnup}/messages.sh . ${ROOT}${cnup}/functions.sh +log "$version starting" + main_queuetab="${cnup}/actions/main.queue" post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"