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

installCDE: don't hardcode path to whoami

Browse source 
Hi.

Patch removes hardcoded paths to echo and whoami in installation scripts.

Thanks.
This commit is contained in:
Nina Didenko 2019-11-20 22:50:06 +03:00 committed by Jon Trulson
parent 0d70d8b120
commit 8db8a22906
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
Log() Log()
{ {
/bin/echo "$1" | tee -a $LOGFILE echo "$1" | tee -a $LOGFILE
} }
MakeTarball() MakeTarball()
@ -537,14 +537,7 @@ XCOMM
PLATFORM_SCRIPT_DIR=hp PLATFORM_SCRIPT_DIR=hp
fi fi
if [ "$PLATFORM" = "aix" ]; if [ $(whoami) != "root" ];
then
USER=$(/bin/whoami)
else
USER=$(/usr/bin/whoami)
fi
if [ "$USER" != "root" ];
then then
echo "" echo ""
echo "You should be root to run this script. Continuing anyway." echo "You should be root to run this script. Continuing anyway."

9
cde/admin/IntegTools/dbTools/mkProd
View file

@ -96,13 +96,6 @@ else # Build system = HP
PLATFORM=hp-ux PLATFORM=hp-ux
fi fi
if [ $PLATFORM = "aix" ];
then
USER=`/bin/whoami`
else
USER=`/usr/bin/whoami`
fi
awkit() { awkit() {
awk ' awk '
BEGIN { BEGIN {
@ -504,7 +497,7 @@ doit()
} }
# set permissions for non-links # set permissions for non-links
if [ "${TYPE%link}" = "$TYPE" ]; then if [ "${TYPE%link}" = "$TYPE" ]; then
if [ "$USER" = "root" ]; then if [ $(whoami) = "root" ]; then
chgrp $GROUP $DEST || chgrp $GROUP $DEST ||
echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2 echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2
chown $OWNER $DEST || chown $OWNER $DEST ||