X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fcn-upgrade;h=df99d7f7e2dba487f0dcdb5de4732a9c9d196946;hb=cc2d171eb93421380d21e00e238a5d35e75f9755;hp=b880f8bc3fc5da676c0c9bc72f59bd30cfe11930;hpb=3baec6f284d37cdbd7928acc1b663c43db255e0d;p=carnet-upgrade.git

diff --git a/src/cn-upgrade b/src/cn-upgrade
index b880f8b..df99d7f 100755
--- a/src/cn-upgrade
+++ b/src/cn-upgrade
@@ -1,13 +1,21 @@
-#!/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
+    # 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
@@ -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=""
@@ -29,6 +37,8 @@ cnup="/usr/share/carnet-upgrade"
 . ${ROOT}${cnup}/messages.sh
 . ${ROOT}${cnup}/functions.sh
 
+log "carnet-upgrade v$version starting"
+
 main_queuetab="${cnup}/actions/main.queue"
 post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"