fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: fatalerrors:81d7f68a1934b78bc5fa13c5a3b9655574ade286
Branches Tags
fatalerrors:master
...
compare: fatalerrors:ee287273131871f5391a6dd7012e4a29078f6f15
Branches Tags
fatalerrors:master

3 Commits
81d7f68a19 ... ee28727313

Author SHA1 Message Date
fatalerrors
ee28727313 Merge branch 'master' of https://git.geoffray-levasseur.org/fatalerrors/init.sh 2024-10-23 20:09:05 +02:00
fatalerrors
dfb05f40fd fix bug when giving config file through command line 2024-10-23 20:07:50 +02:00
fatalerrors
c258e698ab added proxy cleanup before changing it 2024-10-23 20:02:08 +02:00
3 changed files with 14 additions and 6 deletions
Expand all files Collapse all files

2
init.sh
View File

@@ -36,7 +36,7 @@ export LC_ALL=C
export LANG=C export LANG=C
# Version of init # Version of init
export VERSION="0.99.21" export VERSION="0.99.22"
# Store script's path (realpath -s resolve symlinks if init.sh is a symlink) # Store script's path (realpath -s resolve symlinks if init.sh is a symlink)
export MYPATH=$(dirname "$(realpath -s "$0")") export MYPATH=$(dirname "$(realpath -s "$0")")

2
lib/command_line.sh
View File

@@ -92,7 +92,7 @@ read_commandline()
shift 2 shift 2
;; ;;
"-f"|"--file") "-f"|"--file")
export CONFFILES="$CONFFILES $opt" export CONFFILES="$CONFFILES $2"
shift 2 shift 2
;; ;;
"-s"|"--shell") "-s"|"--shell")

16
modules/upgrade_dist.sh
View File

@@ -15,7 +15,7 @@
# * PROXY_SRV_PORT: Working port for general purpose proxy if one declared # * PROXY_SRV_PORT: Working port for general purpose proxy if one declared
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
export VER_upgrade_dist="0.2.3" export VER_upgrade_dist="0.2.4"
# As aptitude might fail if clock is too far from real time, we need to depend # As aptitude might fail if clock is too far from real time, we need to depend
# on ntp # on ntp
@@ -43,9 +43,17 @@ upgrade_dist()
prnt E "Impossible to create directory to receive APT configuration." prnt E "Impossible to create directory to receive APT configuration."
die 60 die 60
) )
fi else
tag_file $proxyfile # Cleanup
echo "Acquire::http::Proxy \"http://${PROXY_APT}:${PROXY_APT_PORT}\";" >> $proxyfile if [[ -s $proxyfile ]]; then
emptyflie $proxyfile
fi
if [[ $(grep "^Acquire::http::Proxy" /etc/apt/apt.conf) ]]; then
sed -i -e "/^Acquire::http::Proxy/d" /etc/apt/apt.conf
fi
fi
tag_file $proxyfile
echo "Acquire::http::Proxy \"http://${PROXY_APT}:${PROXY_APT_PORT}\";" >> $proxyfile
elif [[ -n $PROXY_SRV ]]; then elif [[ -n $PROXY_SRV ]]; then
tag_file $proxyfile tag_file $proxyfile
echo "Acquire::http::Proxy \"http://${PROXY_SRV}:${PROXY_SRV_PORT}\";" >> $proxyfile echo "Acquire::http::Proxy \"http://${PROXY_SRV}:${PROXY_SRV_PORT}\";" >> $proxyfile