mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
installCDE: don't hardcode path to whoami
Hi. Patch removes hardcoded paths to echo and whoami in installation scripts. Thanks.
This commit is contained in:
parent
0d70d8b120
commit
8db8a22906
2 changed files with 3 additions and 17 deletions
|
@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
|
|||
|
||||
Log()
|
||||
{
|
||||
/bin/echo "$1" | tee -a $LOGFILE
|
||||
echo "$1" | tee -a $LOGFILE
|
||||
}
|
||||
|
||||
MakeTarball()
|
||||
|
@ -537,14 +537,7 @@ XCOMM
|
|||
PLATFORM_SCRIPT_DIR=hp
|
||||
fi
|
||||
|
||||
if [ "$PLATFORM" = "aix" ];
|
||||
then
|
||||
USER=$(/bin/whoami)
|
||||
else
|
||||
USER=$(/usr/bin/whoami)
|
||||
fi
|
||||
|
||||
if [ "$USER" != "root" ];
|
||||
if [ $(whoami) != "root" ];
|
||||
then
|
||||
echo ""
|
||||
echo "You should be root to run this script. Continuing anyway."
|
||||
|
|
|
@ -96,13 +96,6 @@ else # Build system = HP
|
|||
PLATFORM=hp-ux
|
||||
fi
|
||||
|
||||
if [ $PLATFORM = "aix" ];
|
||||
then
|
||||
USER=`/bin/whoami`
|
||||
else
|
||||
USER=`/usr/bin/whoami`
|
||||
fi
|
||||
|
||||
awkit() {
|
||||
awk '
|
||||
BEGIN {
|
||||
|
@ -504,7 +497,7 @@ doit()
|
|||
}
|
||||
# set permissions for non-links
|
||||
if [ "${TYPE%link}" = "$TYPE" ]; then
|
||||
if [ "$USER" = "root" ]; then
|
||||
if [ $(whoami) = "root" ]; then
|
||||
chgrp $GROUP $DEST ||
|
||||
echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2
|
||||
chown $OWNER $DEST ||
|
||||
|
|
Loading…
Reference in a new issue