diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2012-01-27 20:45:47 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2012-01-27 20:45:47 +0000 |
| commit | fc5d186d1a12e2973dbc7f25b8a41b232d468211 (patch) | |
| tree | 06a2b115bfdf37985e8167a87c5bd94444c4a2fd /security/tripwire/files/patch-install-install.sh | |
| parent | e918d3106343aa47ac37007a356de63513dc7247 (diff) | |
Additional software only options and binary package build tweaks.`
Notes
Notes:
svn path=/head/; revision=289898
Diffstat (limited to 'security/tripwire/files/patch-install-install.sh')
| -rw-r--r-- | security/tripwire/files/patch-install-install.sh | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/security/tripwire/files/patch-install-install.sh b/security/tripwire/files/patch-install-install.sh index e800ae9e4098..d992b342d57f 100644 --- a/security/tripwire/files/patch-install-install.sh +++ b/security/tripwire/files/patch-install-install.sh @@ -1,19 +1,26 @@ --- install/install.sh.orig 2011-11-21 08:06:56.000000000 -0800 -+++ install/install.sh 2012-01-25 17:05:50.514792833 -0800 -@@ -181,10 +181,10 @@ - TW_LOCAL_PASS="" ++++ install/install.sh 2012-01-26 14:46:55.995316577 -0800 +@@ -174,17 +174,11 @@ + # Starting directory. + START_DIR=`pwd` +-# Site passphrase. +-TW_SITE_PASS="" +- +-# Local passphrase. +-TW_LOCAL_PASS="" +- # If clobber==true, overwrite files; if false, do not overwrite files. -CLOBBER="false" -+CLOBBER=${TRIPWIRE_CLOBBER:-"false"} ++CLOBBER=${TW_CLOBBER:-"false"} # If prompt==true, ask for confirmation before continuing with install. -PROMPT="true" -+PROMPT=${TRIPWIRE_PROMPT:-"true"} ++PROMPT=${TW_PROMPT:-"true"} # Guess where the toplevel for the distribution is. # A bad guess is the current directory -@@ -200,6 +200,7 @@ +@@ -200,6 +194,7 @@ ## Parse the command line. ##------------------------------------------------------- @@ -21,7 +28,7 @@ while [ "x$1" != "x" ] ; do case "$1" in -n) PROMPT="false"; xCLOBBER="true" ;; -@@ -232,6 +233,7 @@ +@@ -232,6 +227,7 @@ esac shift done @@ -29,7 +36,7 @@ ##------------------------------------------------------- ## Print the sign-on banner here before the first -@@ -333,7 +335,7 @@ +@@ -333,7 +329,7 @@ ## passphrases must be specified on the command line. ##------------------------------------------------------- @@ -38,7 +45,7 @@ if [ -z "$TW_SITE_PASS" ] || [ -z "$TW_LOCAL_PASS" ] ; then echo "Error: You must specify site and local passphrase" 1>&2 echo "if no prompting is chosen." 1>&2 -@@ -525,7 +527,7 @@ +@@ -525,7 +521,7 @@ chmod 0750 "$d" > /dev/null fi else @@ -47,7 +54,7 @@ fi done -@@ -541,7 +543,7 @@ +@@ -541,7 +537,7 @@ chmod 0755 "$d" > /dev/null fi else @@ -56,7 +63,7 @@ fi done -@@ -550,6 +552,7 @@ +@@ -550,6 +546,7 @@ ## Copy all files to the location specified. ##======================================================= @@ -64,7 +71,7 @@ echo echo "----------------------------------------------" echo "Copying files..." -@@ -593,7 +596,7 @@ +@@ -593,7 +590,7 @@ f=${TAR_DIR}$d/$ff ff=${dd}/$ff if [ -s $ff ] && [ "$CLOBBER" = "false" ] ; then @@ -73,7 +80,7 @@ else cp "$f" "$dd" if [ $? -eq 0 ]; then -@@ -604,6 +607,12 @@ +@@ -604,6 +601,12 @@ fi fi done |