[lmi-commits] [lmi] master 6e50a5d 02/12: Create a root-owned file in root's $HOME, not someone else's

[Greg Chicares]

branch: master
commit 6e50a5d44419cdb9c10cdca8afdab0d047d389b7
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Create a root-owned file in root's $HOME, not someone else's
---
 lmi_setup_21.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 3050bcd..d324fe8 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -77,9 +77,9 @@ chsh -s /bin/zsh "${NORMAL_USER}"
 
 # Repair /usr/share/libtool/.../ltmain.sh as indicated here:
 #   https://lists.gnu.org/archive/html/libtool-patches/2011-06/msg00001.html
-# Do this as root because root owns the file.
+# Do this as root because root owns the file to be patched.
 
-cat >/home/"${NORMAL_USER}"/ltmain.sh.patch <<EOF
+cat >~/ltmain.sh.patch <<EOF
 --- /usr/share/libtool/build-aux/ltmain.sh.orig 2016-08-20 12:34:31.000000000 
+0000
 +++ /usr/share/libtool/build-aux/ltmain.sh 2017-08-10 13:10:28.466155965 +0000
 @@ -5555,7 +5555,7 @@
@@ -93,8 +93,8 @@ cat >/home/"${NORMAL_USER}"/ltmain.sh.patch <<EOF
  # ifdef __STRICT_ANSI__
 EOF
 
-patch --dry-run --strip=0 --directory=/ 
</home/"${NORMAL_USER}"/ltmain.sh.patch \
- && patch --strip=0 --directory=/ </home/"${NORMAL_USER}"/ltmain.sh.patch
+patch --dry-run --strip=0 --directory=/ <~/ltmain.sh.patch \
+ && patch --strip=0 --directory=/ <~/ltmain.sh.patch
 
 # Enable stable and security upgrades--see:
 #    https://www.debian.org/releases/stretch/amd64/apds03.html.en#idm4504