From dcc5632e1e52f286bb5549da4c30f8eadce11171 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 24 Feb 2003 00:02:12 +0000
Subject: [PATCH] Fix

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@804 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/unix_installer/install.sh.in    |  5 +++--
 sc2/build/unix_installer/installer.config | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sc2/build/unix_installer/install.sh.in b/sc2/build/unix_installer/install.sh.in
index 460fcbc54..f61a9b578 100644
--- a/sc2/build/unix_installer/install.sh.in
+++ b/sc2/build/unix_installer/install.sh.in
@@ -226,8 +226,9 @@ mkdir -p -- "$PREFIX"/lib/uqm 2> /dev/null
 mkdir -p -- "$PREFIX"/bin 2> /dev/null
 
 echo "Unpacking packages..."
-for PACKAGE in `selected_components`; do
-	gzip -dc "$CONTENT_FILE" | tar -xf - -C "$PREFIX"/
+for COMPFILE in `selected_components`; do
+	echo "- $COMPFILE"
+	gzip -dc "$COMPFILE" | tar -xf - -C "$PREFIX"/
 done
 
 echo "Unpacking other stuff..."
diff --git a/sc2/build/unix_installer/installer.config b/sc2/build/unix_installer/installer.config
index 669e32e23..2d5a77388 100644
--- a/sc2/build/unix_installer/installer.config
+++ b/sc2/build/unix_installer/installer.config
@@ -19,7 +19,7 @@ package_filename() {
 	# maybe it will work, maybe it won't.
 	case "$UQM_INSTALL" in
 		NEW|REINSTALL|DOWNGRADE)
-			FILENAME="${CONTENT_PATH}/uqm-${UQM_VERSION}-$PACKNAME.zip"
+			FILENAME="${CONTENT_PATH}uqm-${UQM_VERSION}-$PACKNAME.zip"
 			if [ -f "$FILENAME" ]; then
 				# Found complete package.
 				echo "$FILENAME"
@@ -34,7 +34,7 @@ package_filename() {
 	fi
 
 	# Check for upgrade package.
-	FILENAME="${CONTENT_PATH}/uqm-${UQM_OLDVERSION}_to_${UQM_VERSION}-$PACKNAME.zip"
+	FILENAME="${CONTENT_PATH}uqm-${UQM_OLDVERSION}_to_${UQM_VERSION}-$PACKNAME.zip"
 	if [ -f "$FILENAME" ]; then
 		# Found upgrade package.
 		echo "$FILENAME"
@@ -44,7 +44,7 @@ package_filename() {
 	# Check complete package again, as you can upgrade with a complete
 	# package.
 	if [ "$UQM_INSTALL" = UPGRADE ]; then
-		FILENAME="${CONTENT_PATH}/uqm-${UQM_VERSION}-$PACKNAME.zip"
+		FILENAME="${CONTENT_PATH}uqm-${UQM_VERSION}-$PACKNAME.zip"
 		if [ -f "$FILENAME" ]; then
 			# Found complete package.
 			echo "$FILENAME"
@@ -125,12 +125,12 @@ show_content_path_menu() {
 }
 
 selected_components() {
-	local RESULT COMPONENT VALUE
+	local RESULT PACKAGE VALUE
 	RESULT=""
-	for COMPONENT in $MENU_install_components_ITEMS; do
-		eval VALUE="\$MENU_install_components_ITEM_$COMPONENT"
-		if [ "$VALUE" = checked ]; then
-			RESULT="${RESULT:+$RESULT }$((package_filename $COMPONENT))"
+	for PACKAGE in $UQM_PACKAGES; do
+		eval VALUE="\$CHECK_${PACKAGE}_VALUE"
+		if [ "$VALUE" = CHECKED ]; then
+			RESULT="${RESULT:+$RESULT }$(package_filename $PACKAGE)"
 		fi
 	done
 	echo "$RESULT"