mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
107 lines
2.8 KiB
Diff
107 lines
2.8 KiB
Diff
|
From 8db8a2290683acf94f02e855af668a864d6001c2 Mon Sep 17 00:00:00 2001
|
||
|
|
Subject: [PATCH 1/2] installCDE: don't hardcode path to whoami
|
||
|
|
---
|
||
|
|
cde/admin/IntegTools/dbTools/installCDE.src | 11 ++---------
|
||
|
|
cde/admin/IntegTools/dbTools/mkProd | 9 +--------
|
||
|
|
2 files changed, 3 insertions(+), 17 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
|
||
|
|
index a00fefd1..233b4a96 100755
|
||
|
|
--- a/cde/admin/IntegTools/dbTools/installCDE.src
|
||
|
|
+++ b/admin/IntegTools/dbTools/installCDE.src
|
||
|
|
@@ -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."
|
||
|
|
diff --git a/cde/admin/IntegTools/dbTools/mkProd b/cde/admin/IntegTools/dbTools/mkProd
|
||
|
|
index 44591fab..413a77e8 100755
|
||
|
|
--- a/cde/admin/IntegTools/dbTools/mkProd
|
||
|
|
+++ b/admin/IntegTools/dbTools/mkProd
|
||
|
|
@@ -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 ||
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|
||
|
|
|
||
|
|
From 9221c55a5f811986eaf0e01301827c294ac2e29b Mon Sep 17 00:00:00 2001
|
||
|
|
Subject: [PATCH 2/2] tt_type_comp: use CppCmd definition
|
||
|
|
---
|
||
|
|
cde/lib/tt/bin/tt_type_comp/Imakefile | 4 +++-
|
||
|
|
cde/lib/tt/lib/tt_options.h | 5 +++++
|
||
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile
|
||
|
|
index 92179208..62434929 100644
|
||
|
|
--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
|
||
|
|
+++ b/lib/tt/bin/tt_type_comp/Imakefile
|
||
|
|
@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
|
||
|
|
|
||
|
|
#include "../../tooltalk.tmpl"
|
||
|
|
|
||
|
|
-DEFINES =
|
||
|
|
+CPP_PROGRAM = CppCmd
|
||
|
|
+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
|
||
|
|
+DEFINES = $(CPP_DEFINES)
|
||
|
|
INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
|
||
|
|
|
||
|
|
DEPLIBS = ../../slib/libstt.a TtClientDepLibs
|
||
|
|
diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
|
||
|
|
index 4315daa8..e23bb9e5 100644
|
||
|
|
--- a/cde/lib/tt/lib/tt_options.h
|
||
|
|
+++ b/lib/tt/lib/tt_options.h
|
||
|
|
@@ -529,4 +529,9 @@
|
||
|
|
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#ifdef CPP_PROGRAM
|
||
|
|
+# undef OPT_CPP_PATH
|
||
|
|
+# define OPT_CPP_PATH CPP_PROGRAM
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#endif /* _TT_OPTIONS_H */
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|