Attachment #97884 for bug #148822

View | Details | Raw Unified | Return to bug 148822
Collapse All | Expand All




	echo="echo -n"
fi

#clear

cd `echo $0 | sed -e 's/[^\/]*$//' -e 's/^$/./' -e 's/\/$//'`
MID_INSTALL=`pwd`

echo "********** DATE:  `date`"
echo ""

#$echo "Do you want to continue [yn]? (y): " $SV_NONL
#read answ
#if [ -z "$answ" ]; then
#  answ="y"
#fi
#if [ "$answ" = "n" -o "$answ" = "N" ]; then
#  exit 1
#fi

/bin/sh $MID_INSTALL/select all
/bin/sh $MID_INSTALL/preinstall -a




PATH=$PATH:$MID_INSTALL
export MIDASHOME MIDVERS MID_HOME MID_INSTALL

#clear

if [ ! -f "$MID_HOME/local/default.mk" ] ; then
  echo "*** ERROR: File <$MID_HOME/local/default.mk> does not exist."

    mkdir $MID_HOME/tmp
fi

#time /bin/sh $MID_INSTALL/install -i > $MID_HOME/tmp/install.$$ 2>&1 &
#echo "Running install in background"
#echo "Results are coming in $MID_HOME/tmp/install.$$"
#if [ "$1" = "-a" ]; then 
#  $echo "Waiting for MIDAS installation to finish..."  $SV_NONL
#  wait
#  echo "Finished."
#  echo ""
#fi
#exit 0
/bin/sh $MID_INSTALL/install -i

Return to bug 148822

Lines 24-30 Link Here

(-)06SEPpl1.0~/install/unix/autoconfig (-9 / +9 lines)
24	echo="echo -n"	24	echo="echo -n"
25	fi	25	fi
26		26
27	clear	27	#clear
28		28
29	cd `echo $0 \| sed -e 's/[^\/]*$//' -e 's/^$/./' -e 's/\/$//'`	29	cd `echo $0 \| sed -e 's/[^\/]*$//' -e 's/^$/./' -e 's/\/$//'`
30	MID_INSTALL=`pwd`	30	MID_INSTALL=`pwd`
Lines 54-67 Link Here
54	echo "********** DATE: `date`"	54	echo "********** DATE: `date`"
55	echo ""	55	echo ""
56		56
57	$echo "Do you want to continue [yn]? (y): " $SV_NONL	57	#$echo "Do you want to continue [yn]? (y): " $SV_NONL
58	read answ	58	#read answ
59	if [ -z "$answ" ]; then	59	#if [ -z "$answ" ]; then
60	answ="y"	60	# answ="y"
61	fi	61	#fi
62	if [ "$answ" = "n" -o "$answ" = "N" ]; then	62	#if [ "$answ" = "n" -o "$answ" = "N" ]; then
63	exit 1	63	# exit 1
64	fi	64	#fi
65		65
66	/bin/sh $MID_INSTALL/select all	66	/bin/sh $MID_INSTALL/select all
67	/bin/sh $MID_INSTALL/preinstall -a	67	/bin/sh $MID_INSTALL/preinstall -a

Lines 52-58 Link Here

(-)06SEPpl1.0~/install/unix/install1 (-11 / +12 lines)
52	PATH=$PATH:$MID_INSTALL	52	PATH=$PATH:$MID_INSTALL
53	export MIDASHOME MIDVERS MID_HOME MID_INSTALL	53	export MIDASHOME MIDVERS MID_HOME MID_INSTALL
54		54
55	clear	55	#clear
56		56
57	if [ ! -f "$MID_HOME/local/default.mk" ] ; then	57	if [ ! -f "$MID_HOME/local/default.mk" ] ; then
58	echo "*** ERROR: File <$MID_HOME/local/default.mk> does not exist."	58	echo "*** ERROR: File <$MID_HOME/local/default.mk> does not exist."
Lines 911-923 Link Here
911	mkdir $MID_HOME/tmp	911	mkdir $MID_HOME/tmp
912	fi	912	fi
913		913
914	time /bin/sh $MID_INSTALL/install -i > $MID_HOME/tmp/install.$$ 2>&1 &	914	#time /bin/sh $MID_INSTALL/install -i > $MID_HOME/tmp/install.$$ 2>&1 &
915	echo "Running install in background"	915	#echo "Running install in background"
916	echo "Results are coming in $MID_HOME/tmp/install.$$"	916	#echo "Results are coming in $MID_HOME/tmp/install.$$"
917	if [ "$1" = "-a" ]; then	917	#if [ "$1" = "-a" ]; then
918	$echo "Waiting for MIDAS installation to finish..." $SV_NONL	918	# $echo "Waiting for MIDAS installation to finish..." $SV_NONL
919	wait	919	# wait
920	echo "Finished."	920	# echo "Finished."
921	echo ""	921	# echo ""
922	fi	922	#fi
923	exit 0	923	#exit 0
		924	/bin/sh $MID_INSTALL/install -i