X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fcn-upgrade;h=6abb54615d7a87e9abbedf5a34d5bfb89d632133;hb=33647acc9accaf03069681d6d8a4524aca1bd85d;hp=40aa767dfd5f8e682c5dfbe360207a94bb97702f;hpb=1e70ff3fe998033fd93c8cd177082b8cd566d2ce;p=carnet-upgrade.git

diff --git a/src/cn-upgrade b/src/cn-upgrade
index 40aa767..6abb546 100755
--- a/src/cn-upgrade
+++ b/src/cn-upgrade
@@ -1,8 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 # last update: 2005-01-07
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Ivan 'ico' Rako <irako@srce.hr>
-version="carnet-upgrade v2.1.4"
+version="%PKG_VERSION%"
+
+# restart upgrade under script for logging purposes
+if [ "$1" == "--no-script" ]; then
+    # restore umask to default
+    umask 0022
+
+    shift
+elif [ -x /usr/bin/script ]; then
+    # make logs safe
+    umask 0077
+    chmod og= /var/log/carnet-upgrade.* 2>/dev/null
+
+    # restart through script
+    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
 
@@ -17,9 +33,11 @@ fi
 
 cnup="/usr/share/carnet-upgrade"
 
+. ${ROOT}${cnup}/data.sh
 . ${ROOT}${cnup}/messages.sh
 . ${ROOT}${cnup}/functions.sh
-. ${ROOT}${cnup}/data.sh
+
+log "carnet-upgrade v$version starting"
 
 main_queuetab="${cnup}/actions/main.queue"
 post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"