From 0961da28b97481b1d17e9af5b4f759e9c75c8414 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 26 May 2012 17:30:53 -0600 Subject: [PATCH] Several adjustments to installCDE.src: 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. --- cde/admin/IntegTools/dbTools/installCDE.src | 105 ++++++++++---------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src index 8f4adcf4..0ebfb940 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -50,7 +50,7 @@ REVISION="$(echo "$Revision: /main/20 $" | awk '{print $2}')" Log() { - echo "$1" | tee -a /tmp/installCDE.log + echo "$1" | tee -a installCDE.log } MakeTarball() @@ -410,56 +410,56 @@ XCOMM USAGE() { -echo "Usage: $(basename $0) {-s |-z } [options]" -echo "" -echo "\t-s \t\t\tthe top of the build tree" -echo "\t-z \t\tthe desktop install package" -echo "" -echo "\tOptions:" -echo "" -echo "\t[-t ]\tif specified create an" -echo "\t\t\t\t\tinstall package and store it in the" -echo "\t\t\t\t\tdestination." -echo "\t[-pI ]\twhere" CDE_INSTALLATION_TOP "will be linked to." -echo "\t[-pC ]\twhere" CDE_CONFIGURATION_TOP "will be linked to." -echo "\t[-pV ]\twhere" CDE_LOGFILES_TOP "will be linked to." -echo "" -echo "\t[-a ]\t\talternate place to get the" -echo "\t\t\t\t\tudb files from." -echo "\t[-f ]\t\t\tspecify filesets to be loaded." -echo "\t\t\t\t\tThe list should be double-quoted," -echo "\t\t\t\t\tspace-separated, with no .udb" -echo "\t\t\t\t\textensions." -echo "" -echo "\t[-clean]\t\t\tremove the temporary, configuration, and" -echo "\t\t\t\t\tinstallation directory" -echo "\t[-cleanTwo]\t\t\tremove the temporary and installation " -echo "\t\t\t\t\tdirectory, but NOT the configuration directory" -echo "\t[-cleanEtc]\t\t\tremove the configuration directory, but " -echo "\t\t\t\t\NOT the temporary and installation directories" -echo "\t[-prog]\t\t\t\tload only the development environment" -echo "\t[-runtime]\t\t\tload only the runtime environment" -echo "\t[-relative]\t\t\trun the relative-located config scripts" -echo "\t[-pack]\t\t\t\tcreate a packing list" -echo "\t[-pseudo]\t\t\tdo not configure desktop when installing" -echo "\t[-nocompress]\t\t\tdo not compress tarball when creating package" -echo "\t[-lang LANG]\t\t\tspecify LANG to load appropriate localized" -echo "\t\t\t\t\tfilesets" -echo "\t[-LeaveLinks]\t\t\t\tdo not delete the links after cleaning" -echo "" -echo "\t[-LinkStepOnly]\t\t\tset up the -pI, -pC, and -pV links" -echo "\t\t\t\t\tthen exit" -echo "\t[-DontRunScripts]\t\tstop after installation" -echo "\t[-RunScriptsOnly]\t\tonly execute the scripts" -echo "\t[-configureOnly]\t\tonly configure the desktop" -echo "" -echo "\tExamples:" -echo "" -echo "\tinstallCDE -s /x/cde_hp700_90" -echo "\tinstallCDE -s /x/cde_aix_32 -f \"CDE_MIN CDE-SHLIBS\"" -echo "\tinstallCDE -s /x/cde_sun_52 -pI /bigdisk/opt/dt -clean" -echo "\tinstallCDE -s /x/cde_sun_52 -pI /dtinstall -clean\\" -echo "\t\t-pseudo -t /dtpackages -nocompress" +echo -e "Usage: $(basename $0) {-s |-z } [options]" +echo -e "" +echo -e "\t-s \t\t\tthe top of the build tree" +echo -e "\t-z \t\tthe desktop install package" +echo -e "" +echo -e "\tOptions:" +echo -e "" +echo -e "\t[-t ]\tif specified create an" +echo -e "\t\t\t\t\tinstall package and store it in the" +echo -e "\t\t\t\t\tdestination." +echo -e "\t[-pI ]\twhere" CDE_INSTALLATION_TOP "will be linked to." +echo -e "\t[-pC ]\twhere" CDE_CONFIGURATION_TOP "will be linked to." +echo -e "\t[-pV ]\twhere" CDE_LOGFILES_TOP "will be linked to." +echo -e "" +echo -e "\t[-a ]\t\talternate place to get the" +echo -e "\t\t\t\t\tudb files from." +echo -e "\t[-f ]\t\t\tspecify filesets to be loaded." +echo -e "\t\t\t\t\tThe list should be double-quoted," +echo -e "\t\t\t\t\tspace-separated, with no .udb" +echo -e "\t\t\t\t\textensions." +echo -e "" +echo -e "\t[-clean]\t\t\tremove the temporary, configuration, and" +echo -e "\t\t\t\t\tinstallation directory" +echo -e "\t[-cleanTwo]\t\t\tremove the temporary and installation " +echo -e "\t\t\t\t\tdirectory, but NOT the configuration directory" +echo -e "\t[-cleanEtc]\t\t\tremove the configuration directory, but " +echo -e "\t\t\t\t\NOT the temporary and installation directories" +echo -e "\t[-prog]\t\t\t\tload only the development environment" +echo -e "\t[-runtime]\t\t\tload only the runtime environment" +echo -e "\t[-relative]\t\t\trun the relative-located config scripts" +echo -e "\t[-pack]\t\t\t\tcreate a packing list" +echo -e "\t[-pseudo]\t\t\tdo not configure desktop when installing" +echo -e "\t[-nocompress]\t\t\tdo not compress tarball when creating package" +echo -e "\t[-lang LANG]\t\t\tspecify LANG to load appropriate localized" +echo -e "\t\t\t\t\tfilesets" +echo -e "\t[-LeaveLinks]\t\t\t\tdo not delete the links after cleaning" +echo -e "" +echo -e "\t[-LinkStepOnly]\t\t\tset up the -pI, -pC, and -pV links" +echo -e "\t\t\t\t\tthen exit" +echo -e "\t[-DontRunScripts]\t\tstop after installation" +echo -e "\t[-RunScriptsOnly]\t\tonly execute the scripts" +echo -e "\t[-configureOnly]\t\tonly configure the desktop" +echo -e "" +echo -e "\tExamples:" +echo -e "" +echo -e "\tinstallCDE -s /x/cde_hp700_90" +echo -e "\tinstallCDE -s /x/cde_aix_32 -f \"CDE_MIN CDE-SHLIBS\"" +echo -e "\tinstallCDE -s /x/cde_sun_52 -pI /bigdisk/opt/dt -clean" +echo -e "\tinstallCDE -s /x/cde_sun_52 -pI /dtinstall -clean\\" +echo -e "\t\t-pseudo -t /dtpackages -nocompress" } XCOMM @@ -546,9 +546,8 @@ XCOMM then USAGE echo "" - echo "You must be root to run this script" + echo "You must be root to run this script. Continuing anyway." echo "" - exit 1 fi if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ] -- 2.25.1