Create Final installer tar with corrected unwrap script

build.sh

@@ -226,12 +226,44 @@ rm -f ${RELEASE_DIR}/archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-base.tgz
 tar cfvz ${RELEASE_DIR}/archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-base.tgz .
 cd ${WORLD_ROOT}
 
+echo ""
+echo "===================================================================="
+echo " Creating archie-${ARCHIE_VER}-install.tar"
+echo "===================================================================="
+echo ""
+cd ${RELEASE_DIR}/install
+rm -f ${RELEASE_DIR}/archie-${ARCHIE_VER}.tar
+tar cvf ${RELEASE_DIR}/archie-${ARCHIE_VER}.tar .
+cd ${WORLD_ROOT}
 
+echo ""
+echo "===================================================================="
+echo " Developer Output"
+echo "===================================================================="
+echo ""
+echo "export ARCHIE_ROOT=${ARCHIE_ROOT}"
+echo "export PROSPERO_ROOT=${PROSPERO_ROOT}"
+echo "export BERKDB_ROOT=${BERKDB_ROOT}"
+echo "export TCL_ROOT=${TCL_ROOT}"
+echo "export TCLDP_ROOT=${TCLDP_ROOT}"
+echo "export TK_ROOT=${TK_ROOT}"
+echo "export SYSTYPE=${SYSTYPE}"
+echo "export DEST_DIR=${DEST_DIR}"
+echo "export PATH=${DEST_DIR}/bin:${PATH}"
 
-
+echo ""
-
+echo "===================================================================="
-
+echo " Everything build"
-
+echo "===================================================================="
-
+echo ""
-
+echo "The Final packages are in the ${RELEASE_DIR}"
+echo "${RELEASE_DIR}/archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-A.tgz"
+echo "${RELEASE_DIR}/archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-B.tgz"
+echo "${RELEASE_DIR}/archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-base.tgz"
+echo "${RELEASE_DIR}/archie-${ARCHIE_VER}.tar"
+echo ""
+echo "===================================================================="
+echo " Everything build"
+echo "===================================================================="
+echo ""
 

release/install/unwrap

@@ -65,30 +65,51 @@ if ( $ans != "y" ) then
 	exit
 endif
 
-set ARCH=`uname -s | tr '[A-Z]' '[a-z]'`
+set ARCH=`uname -s`
+set MACHINE=`uname -m`
 
 set dirname=`dirname $0`
 
+if ( $MACHINE = "sun4m" ) then
 switch ($ARCH)
-   case sunos:
+   case SunOS:
-	if ( `uname -r` == 5.4 ) then
+	if ( `uname -r` == 5.6 ) then
 		set REL=5.4
 	endif 
 	if ( `uname -r` == 5.5 ) then
 		set REL=5.4
 	endif 
+	if ( `uname -r` == 5.4 ) then
+		set REL=5.4
+	endif 
 	if ( `uname -r` == 4.1.4 ) then
 		set REL=4.1.4
 	endif
 	breaksw
-   case aix:
+   case AIX:
 	set REL=3.2
 	breaksw
 endsw
+endif
+
+if ( $MACHINE = "i86pc" ) then
+switch ($ARCH)
+   case SunOS:
+	if ( `uname -r` == 5.11 ) then
+		set REL=5.6
+	endif 
+	if ( `uname -r` == 5.6 ) then
+		set REL=5.6
+	endif 
+   case AIX:
+	set REL=5.6
+	breaksw
+endsw
+endif
 
 
 echo "Phase 1: Unpacking the distribution"
-set name=archie-${VERS}-base.tgz
+set name=archie-${VERS}-${ARCH}-${REL}-${MACHINE}-base.tgz
 	echo -n "Looking for the distribution file [$name] ..."
 	if ( -f $name ) then
 		echo "found it."
@@ -98,10 +119,10 @@ set name=archie-${VERS}-base.tgz
 	It looks like you already have an archie system in ~$ARCHIE. This
 	probably means you want to upgrade your system. The 3.3 upgrade only
 	requires that you upgrade your binary files along with a few
-	miscellaneous files. The \`archie-${VERS}-${ARCH}-${REL}.tgz'
+	miscellaneous files. The \`archie-${VERS}-${ARCH}-${REL}-${MACHINE}.tgz'
 	distribution file contains all you require.
 EOC1
-			if ( $ARCH != "aix") then
+			if ( $ARCH != "AIX") then
 				cat - <<EOC2
 
 	You probably don't need to install this \`base' distribution file.
@@ -144,7 +165,7 @@ EOC3
 		echo "not found."
 	endif
 
-set name=archie-${VERS}-${ARCH}-${REL}-A.tgz
+set name=archie-${VERS}-${ARCH}-${REL}-${MACHINE}-A.tgz
 	echo -n "Looking for the distribution file [$name] ..."
 	if ( -f $name ) then
 		echo "found it."
@@ -161,7 +182,7 @@ set name=archie-${VERS}-${ARCH}-${REL}-A.tgz
 		echo "not found."
 	endif
 
-set name=archie-${VERS}-${ARCH}-${REL}-B.tgz
+set name=archie-${VERS}-${ARCH}-${REL}-${MACHINE}-B.tgz
 	echo -n "Looking for the distribution file [$name] ..."
 	if ( -f $name ) then
 		echo "found it."