projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle AAI upgrade.
[carnet-upgrade.git]
/
src
/
cn-upgrade
diff --git
a/src/cn-upgrade
b/src/cn-upgrade
index
4fb7fd6
..
6abb546
100755
(executable)
--- 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>
# 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
# 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
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
fi
set -e
@@
-29,6
+37,8
@@
cnup="/usr/share/carnet-upgrade"
. ${ROOT}${cnup}/messages.sh
. ${ROOT}${cnup}/functions.sh
. ${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"
main_queuetab="${cnup}/actions/main.queue"
post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"