Glacier v3.3.0

install/post-install-2-1-23.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+WORKING_DIR=$(pwd)
+SRC_DIR=$(pwd)/../src
+
+mv /etc/glacier.conf /etc/glacier.conf.old
+echo "WARNING: /etc/glacier.conf saved as /etc/glacier.conf.old\n"
+mv $SRC_DIR/glacier.conf /etc

src/glacier

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Glacier. If not, see <https://www.gnu.org/licenses/>. 
 
-source /etc/glacier/hooks
+. /etc/glacier/hooks
 
 #get_pkg() {
 #	printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
@@ -34,24 +34,24 @@ source /etc/glacier/hooks
 
 get_pkg() {
 	printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
-		for r in $ALLOWED_REPOS; do
+		for r in ${ALLOWED_REPOS[@]}; do
-			$GLACIER_DOWNLOAD_BACKEND $GREPO/$r/$2.tar.gz
+			$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.tar.gz
-			find $2.tar.gz
-				if [ "$?" != "0" ]; then
-					printf "$red[ $error ]$reset Package '$2' not found.\n"
-					exit 1
-				fi
 		done
+		find $2.tar.gz
+			if [ "$?" != "0" ]; then
+				printf "$red[ $error ]$reset Package '$2' not found.\n"
+				exit 1
+			fi
 
 	printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
-		for r in $ALLOWED_REPOS; do
+		for r in ${ALLOWED_REPOS[@]}; do
-			$GLACIER_DOWNLOAD_BACKEND $GREPO/$r/$2.checksum
+			$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.checksum
-			find $2.checksum
-				if [ "$?" != "0" ]; then
-					printf "$red[ $error ]$reset Package checksum not found.\n"
-					exit 1
-				fi
 		done
+		find $2.checksum
+			if [ "$?" != "0" ]; then
+				printf "$red[ $error ]$reset Package checksum not found.\n"
+				exit 1
+			fi
 }
 int_check() {
 	if [ "$GLACIER_DO_INT_CHECK" = "true" ]; then

src/glacier.conf

@@ -6,7 +6,7 @@
 # Repository Glacier will download programs from
 
 	export GREPO="https://git.everestlinux.org/EverestLinux/glacier-pkgs/raw/branch/main"
-	export ALLOWED_REPOS="world galaxy universe multiverse"
+	export ALLOWED_REPOS=("world" "galaxy" "universe" "multiverse")
 
 # Define colors and unicode symbols to be used
 	export red="\033[1;31m"

src/test/array-test.sh

@@ -0,0 +1,5 @@
+array=("world" "galaxy" "universe" "multiverse")
+
+for i in "${array[@]}"; do
+	echo "$i"
+done

src/test/glacier.conf

@@ -0,0 +1,37 @@
+# /etc/glacier.conf
+# The settings stored in this file will be loaded when Glacier is called
+# For more information on each of these options, see https://git.everest
+#
+
+# Repository Glacier will download programs from
+
+	export GREPO="https://git.everestlinux.org/EverestLinux/glacier-pkgs/raw/branch/main"
+	export ALLOWED_REPOS=("world" "galaxy" "universe" "multiverse")
+
+# Define colors and unicode symbols to be used
+	export red="\033[1;31m"
+	export green="\033[1;32m"
+	export yellow="\033[1;33m"
+	export blue="\033[1;34m"
+	export reset="\033[m"
+	export check="\xE2\x9C\x93"
+	export error="\xE2\x9C\x95"
+	export warning="\x21"
+	export question="\x3F"
+
+# Which backend Glacier will use to download files
+# Selecting more than one backend will cause breakage
+	export GLACIER_DOWNLOAD_BACKEND="wget --quiet --show-progress"
+	#export GLACIER_DOWNLOAD_BACKEND="curl --output $2.tar.gz"
+	#export GLACIER_DOWNLOAD_BACKEND="aria2c"
+
+# Enable/disable package integrity checking
+# WARNING: Keeping this enabled is strongly recommended.
+# This option ensures all packages from the repositories are genuine.
+
+	export GLACIER_DO_INT_CHECK="true"
+
+#
+# end /etc/glacier.conf
+#
+

src/test/glacier.test

@@ -34,24 +34,24 @@ source $(pwd)/hooks-test
 
 get_pkg() {
 	printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
-		for r in $ALLOWED_REPOS; do
+		for r in ${ALLOWED_REPOS[@]}; do
-			$GLACIER_DOWNLOAD_BACKEND $GREPO/$r/$2.tar.gz
+			$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.tar.gz
-			find $2.tar.gz
-				if [ "$?" != "0" ]; then
-					printf "$red[ $error ]$reset Package '$2' not found.\n"
-					exit 1
-				fi
 		done
+		find $2.tar.gz
+			if [ "$?" != "0" ]; then
+				printf "$red[ $error ]$reset Package '$2' not found.\n"
+				exit 1
+			fi
 
 	printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
-		for r in $ALLOWED_REPOS; do
+		for r in ${ALLOWED_REPOS[@]}; do
-			$GLACIER_DOWNLOAD_BACKEND $GREPO/$r/$2.checksum
+			$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.checksum
-			find $2.checksum
-				if [ "$?" != "0" ]; then
-					printf "$red[ $error ]$reset Package checksum not found.\n"
-					exit 1
-				fi
 		done
+		find $2.checksum
+			if [ "$?" != "0" ]; then
+				printf "$red[ $error ]$reset Package checksum not found.\n"
+				exit 1
+			fi
 }
 int_check() {
 	if [ "$GLACIER_DO_INT_CHECK" = "true" ]; then
@@ -148,7 +148,7 @@ clear_cache() {
 #
 
 debug_info() {
-	printf "$blue>> Glacier v3.2.1$reset\n"
+	printf "$blue>> Glacier v3.3.0$reset\n"
 	printf ">> Checking for valid download backend...\n"
 		whereis wget
 		whereis curl
@@ -271,7 +271,7 @@ case $1 in
 		exit 0
 	;;
 	-v|--version)
-		printf "${blue}Glacier v3.2.1${reset}\n"
+		printf "${blue}Glacier v3.3.0${reset}\n"
 		exit 0
 	;;
 	-f|install)