Merge branch 'master' of https://git.geoffray-levasseur.org/fatalerrors/init.sh

init.sh

@@ -36,7 +36,7 @@ export LC_ALL=C
 export LANG=C
 
 # 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)
 export MYPATH=$(dirname "$(realpath -s "$0")")

lib/command_line.sh

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

modules/upgrade_dist.sh

@@ -15,7 +15,7 @@
 #   * 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
 # on ntp
@@ -43,9 +43,17 @@ upgrade_dist()
 		prnt E "Impossible to create directory to receive APT configuration."
 		die 60
 	    )
-	fi
-	tag_file $proxyfile
-	echo "Acquire::http::Proxy \"http://${PROXY_APT}:${PROXY_APT_PORT}\";" >> $proxyfile
+	else
+            # Cleanup
+            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
 	tag_file $proxyfile
 	echo "Acquire::http::Proxy \"http://${PROXY_SRV}:${PROXY_SRV_PORT}\";" >> $proxyfile