external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Several adjustments to installCDE.src:

Browse source 
Do not require the user to be root

 Use -e in echo statments so that embedded \t's etc will display.

 Do not save install log in /tmp with a known name, especially since
 it is supposed to be run as root.  This is a Bad Thing To Do (tm).
 Instead just save the log in the current dir.
This commit is contained in:
Jon Trulson 2012-05-26 17:30:53 -06:00
parent 9a74b54870
commit 0961da28b9
1 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

105
cde/admin/IntegTools/dbTools/installCDE.src
View file

@ -50,7 +50,7 @@ REVISION="$(echo "$Revision: /main/20 $" | awk '{print $2}')"
Log() Log()
{ {
echo "$1" | tee -a /tmp/installCDE.log echo "$1" | tee -a installCDE.log
} }
MakeTarball() MakeTarball()
@ -410,56 +410,56 @@ XCOMM
USAGE() USAGE()
{ {
echo "Usage: $(basename $0) {-s <source>|-z <package>} [options]" echo -e "Usage: $(basename $0) {-s <source>|-z <package>} [options]"
echo "" echo -e ""
echo "\t-s <source>\t\t\tthe top of the build tree" echo -e "\t-s <source>\t\t\tthe top of the build tree"
echo "\t-z <package>\t\tthe desktop install package" echo -e "\t-z <package>\t\tthe desktop install package"
echo "" echo -e ""
echo "\tOptions:" echo -e "\tOptions:"
echo "" echo -e ""
echo "\t[-t <package_destination>]\tif specified create an" echo -e "\t[-t <package_destination>]\tif specified create an"
echo "\t\t\t\t\tinstall package and store it in the" echo -e "\t\t\t\t\tinstall package and store it in the"
echo "\t\t\t\t\tdestination." echo -e "\t\t\t\t\tdestination."
echo "\t[-pI <actual install location>]\twhere" CDE_INSTALLATION_TOP "will be linked to." echo -e "\t[-pI <actual install location>]\twhere" CDE_INSTALLATION_TOP "will be linked to."
echo "\t[-pC <actual config location>]\twhere" CDE_CONFIGURATION_TOP "will be linked to." echo -e "\t[-pC <actual config location>]\twhere" CDE_CONFIGURATION_TOP "will be linked to."
echo "\t[-pV <actual var location>]\twhere" CDE_LOGFILES_TOP "will be linked to." echo -e "\t[-pV <actual var location>]\twhere" CDE_LOGFILES_TOP "will be linked to."
echo "" echo -e ""
echo "\t[-a <udb directory>]\t\talternate place to get the" echo -e "\t[-a <udb directory>]\t\talternate place to get the"
echo "\t\t\t\t\tudb files from." echo -e "\t\t\t\t\tudb files from."
echo "\t[-f <filesets>]\t\t\tspecify filesets to be loaded." echo -e "\t[-f <filesets>]\t\t\tspecify filesets to be loaded."
echo "\t\t\t\t\tThe list should be double-quoted," echo -e "\t\t\t\t\tThe list should be double-quoted,"
echo "\t\t\t\t\tspace-separated, with no .udb" echo -e "\t\t\t\t\tspace-separated, with no .udb"
echo "\t\t\t\t\textensions." echo -e "\t\t\t\t\textensions."
echo "" echo -e ""
echo "\t[-clean]\t\t\tremove the temporary, configuration, and" echo -e "\t[-clean]\t\t\tremove the temporary, configuration, and"
echo "\t\t\t\t\tinstallation directory" echo -e "\t\t\t\t\tinstallation directory"
echo "\t[-cleanTwo]\t\t\tremove the temporary and installation " echo -e "\t[-cleanTwo]\t\t\tremove the temporary and installation "
echo "\t\t\t\t\tdirectory, but NOT the configuration directory" echo -e "\t\t\t\t\tdirectory, but NOT the configuration directory"
echo "\t[-cleanEtc]\t\t\tremove the configuration directory, but " echo -e "\t[-cleanEtc]\t\t\tremove the configuration directory, but "
echo "\t\t\t\t\NOT the temporary and installation directories" echo -e "\t\t\t\t\NOT the temporary and installation directories"
echo "\t[-prog]\t\t\t\tload only the development environment" echo -e "\t[-prog]\t\t\t\tload only the development environment"
echo "\t[-runtime]\t\t\tload only the runtime environment" echo -e "\t[-runtime]\t\t\tload only the runtime environment"
echo "\t[-relative]\t\t\trun the relative-located config scripts" echo -e "\t[-relative]\t\t\trun the relative-located config scripts"
echo "\t[-pack]\t\t\t\tcreate a packing list" echo -e "\t[-pack]\t\t\t\tcreate a packing list"
echo "\t[-pseudo]\t\t\tdo not configure desktop when installing" echo -e "\t[-pseudo]\t\t\tdo not configure desktop when installing"
echo "\t[-nocompress]\t\t\tdo not compress tarball when creating package" echo -e "\t[-nocompress]\t\t\tdo not compress tarball when creating package"
echo "\t[-lang LANG]\t\t\tspecify LANG to load appropriate localized" echo -e "\t[-lang LANG]\t\t\tspecify LANG to load appropriate localized"
echo "\t\t\t\t\tfilesets" echo -e "\t\t\t\t\tfilesets"
echo "\t[-LeaveLinks]\t\t\t\tdo not delete the links after cleaning" echo -e "\t[-LeaveLinks]\t\t\t\tdo not delete the links after cleaning"
echo "" echo -e ""
echo "\t[-LinkStepOnly]\t\t\tset up the -pI, -pC, and -pV links" echo -e "\t[-LinkStepOnly]\t\t\tset up the -pI, -pC, and -pV links"
echo "\t\t\t\t\tthen exit" echo -e "\t\t\t\t\tthen exit"
echo "\t[-DontRunScripts]\t\tstop after installation" echo -e "\t[-DontRunScripts]\t\tstop after installation"
echo "\t[-RunScriptsOnly]\t\tonly execute the scripts" echo -e "\t[-RunScriptsOnly]\t\tonly execute the scripts"
echo "\t[-configureOnly]\t\tonly configure the desktop" echo -e "\t[-configureOnly]\t\tonly configure the desktop"
echo "" echo -e ""
echo "\tExamples:" echo -e "\tExamples:"
echo "" echo -e ""
echo "\tinstallCDE -s /x/cde_hp700_90" echo -e "\tinstallCDE -s /x/cde_hp700_90"
echo "\tinstallCDE -s /x/cde_aix_32 -f \"CDE_MIN CDE-SHLIBS\"" echo -e "\tinstallCDE -s /x/cde_aix_32 -f \"CDE_MIN CDE-SHLIBS\""
echo "\tinstallCDE -s /x/cde_sun_52 -pI /bigdisk/opt/dt -clean" echo -e "\tinstallCDE -s /x/cde_sun_52 -pI /bigdisk/opt/dt -clean"
echo "\tinstallCDE -s /x/cde_sun_52 -pI /dtinstall -clean\\" echo -e "\tinstallCDE -s /x/cde_sun_52 -pI /dtinstall -clean\\"
echo "\t\t-pseudo -t /dtpackages -nocompress" echo -e "\t\t-pseudo -t /dtpackages -nocompress"
} }
XCOMM XCOMM
@ -546,9 +546,8 @@ XCOMM
then then
USAGE USAGE
echo "" echo ""
echo "You must be root to run this script" echo "You must be root to run this script. Continuing anyway."
echo "" echo ""
exit 1
fi fi
if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ] if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]