Changeset 154110

Timestamp:

Oct 22, 2016, 1:01:24 AM (8 years ago)

Author:

cal@…

Message:

Installer postflight: Fix useless test

$OUR_STRING used to contain a timestamp down to second precision, which makes
it very unlikely to hit a match. grep for something more likely to match
instead.

File:

• trunk/base/portmgr/dmg/postflight.in (modified) (2 diffs)

trunk/base/portmgr/dmg/postflight.in

@@ -51 +51 @@
 TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
 BACKUP_SUFFIX=macports-saved_${TIMESTAMP}
-OUR_STRING="MacPorts Installer addition on ${TIMESTAMP}"
+OUR_BASESTRING="MacPorts Installer addition"
+OUR_STRING="${OUR_BASESTRING} on ${TIMESTAMP}"
 
 OLD_MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
@@ -91 +92 @@
 # which hints that we've already tweaked it and therefore already backed it up.
 function write_setting () {
-    if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_STRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
+    if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_BASESTRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
         echo "Backing up your ${HOME}/.${CONF_FILE} shell confguration file as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX} before adapting it for MacPorts."
         /bin/cp -fp "${HOME}/.${CONF_FILE}" "${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}" || {