Tweak thaw, update build-tgz and gen-tgz-list for repo changes

build-extensions

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build Freon Linux software from source.
-# Version: 0.5.0
+# Version: 0.6.0
 # (C) Chris Dorman, 2018-2020 GPLv3+
 
 corecount="25"

build-tgz

@@ -30,21 +30,16 @@ case $1 in
 		if [ -d $tmpdir ]; then
 			rm -rf $tmpdir
 		fi
-			
+
 		./build-extensions $1
-		
+
 		mkdir $tmpdir
-					
 		mkdir $freondir
 		
-		if [ -f "deps/${1}.deps" ]; then
-			cp deps/$1.deps $tmpdir/
-		fi
-		
 		if [ -f "deps/${1}.exec" ]; then
 			cp deps/$1.exec $tmpdir/execute.sh
 		fi
-			
+
 		cp -av $freondir $tmpdir/.
 		
 		cd $tmpdir

deps/glib2.deps

@@ -1,14 +1,8 @@
 harfbuzz
-cairo
 ffi
-atk
-pango
-png16
-jpg62
-xcb
 gobject-intro
-gtk2
-idn
+pcre
 fribidi
-gdk-pixbuf
+selinux
 util-linux
+libbsd

deps/gtk2.deps

@@ -2,3 +2,13 @@ glib2
 pcre
 expat
 gdk-pixbuf
+cairo
+freetype
+fribidi
+png16
+atk
+pango
+fontconfig
+bz2
+xlibs
+libbsd

deps/harfbuzz.deps

@@ -1,2 +1,5 @@
 freetype
 png16
+bz2
+glib2
+pcre

deps/hexchat.deps

@@ -1,5 +1,4 @@
-glib2
 gtk2
 xlibs
 notify
-selinux
+menu-cache

deps/pango.deps

@@ -0,0 +1,4 @@
+glib2
+fribidi
+ffi
+pcre

deps/xfont.deps

@@ -1,3 +0,0 @@
-fontenc
-freetype
-png16

deps/xlibs.deps

@@ -0,0 +1,4 @@
+png16
+fontenc
+fontconfig
+libbsd

files/bin/thaw

@@ -55,6 +55,10 @@ case $1 in
 			echo "${2} is already installed."
 			exit 0
 		fi
+
+		if [ -f $TMPPATH/$2 ]; then
+			rm $TMPPATH/$2
+		fi
 		
 		if [ ! -d $TMPPATH/$2 ]; then
 			mkdir $TMPPATH/$2
@@ -68,6 +72,7 @@ case $1 in
 			echo "Downloading ${2}..."
 			
 			wget $(cat $MIRRORFILE)/$2.tgz -P $TMPPATH/
+			wget $(cat $MIRRORFILE)/$2.deps -P $TMPPATH/
 		else
 			echo "${2} was not found in repository."
 			exit 1
@@ -80,7 +85,7 @@ case $1 in
 		status
 		
 		# Examine dependencies for package
-		if [ -f "$TMPPATH/$2/$2.deps" ]; then
+		if [ -f "$TMPPATH/$2.deps" ]; then
 			i=1
 			echo ""
 			echo "++++++++++++++++++++++++++++++++++++++++"
@@ -92,7 +97,7 @@ case $1 in
 				else
 					echo "$line"
 				fi
-			done < $TMPPATH/$2/$2.deps
+			done < $TMPPATH/$2.deps
 			sleep 1
 			echo "++++++++++++++++++++++++++++++++++++++++"
 			echo "Installing dependencies..."
@@ -104,7 +109,7 @@ case $1 in
 					echo "Installing ${line} for ${2}"
 					thaw get-install ${line}
 				fi
-			done < $TMPPATH/$2/$2.deps
+			done < $TMPPATH/$2.deps
 			echo "++++++++++++++++++++++++++++++++++++++++"
 			
 		fi
@@ -118,21 +123,21 @@ case $1 in
 			echo "Running ${2}'s execution script..."
 			$TMPPATH/$2/execute.sh
 		fi
-		
-		if [ -f "/execute.sh" ]; then
-			rm /execute.sh
-		fi
-		
-		if [ -f "/$2.deps" ]; then
-			rm /$2.deps
-		fi
-		
-		if [ -f "/$2.tgz" ]; then
-			rm /$2.tgz
-		fi
-		
+
 		echo -n "Cleaning up..."
-		rm -r $TMPPATH/$2
+		if [ -f "/execute.sh" ]; then
+                        rm /execute.sh
+                fi
+
+                if [ -f "/$2.deps" ]; then
+                        rm /$2.deps
+                fi
+
+                if [ -f "/$2.tgz" ]; then
+                        rm /$2.tgz
+                fi
+
+		rm -r $TMPPATH/*
 		status
 		
 		echo -n "Marking ${2} in the installation database..."

gen-tgz-list

@@ -3,6 +3,8 @@
 # Version: 0.0.1
 # (C) Chris Dorman, 2020 GPLv3+
 
+MIRRORPATH="/opt/htdocs/freon/files/packages"
+
 echo "MAKE SURE THE ONLY .tgz FILES ARE PACKAGES IN THE REPO WITHIN THE SAME DIRECTORY OF THIS FILE!"
 
 sleep 2
@@ -11,3 +13,5 @@ for f in *.tgz
 do
 	echo "${f%.tgz}" >> package.list
 done
+
+cp -a * $MIRRORPATH/.