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

diff --git a/src/cn-upgrade b/src/cn-upgrade
index c5f5e40..df99d7f 100755
--- a/src/cn-upgrade
+++ b/src/cn-upgrade
@@ -1,15 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 # last update: 2005-01-07
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Ivan 'ico' Rako <irako@srce.hr>
-version="carnet-upgrade v4.0.0"
+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
-    exec /usr/bin/script -a -c "$0 --no-script $@" \
-           /var/log/carnet-upgrade.typescript
+    # 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,7 +25,7 @@ set -e
 if [ "$DEBUG" ]; then
   set -x
   #ROOT=/home/jelly/work/src/carnet-upgrade
-  # make apt-get simulate-only for debug
+  # make apt simulate-only for debug
   s=s
 else
   ROOT=""
@@ -25,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"