From 288a9c3a7e2ed8a0c9111a61fcd4e58f3973ab24 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 12 Nov 2019 17:19:10 -0800
Subject: [PATCH] Cleanup command substitution styles.

---
 install.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/install.sh b/install.sh
index 062d104..f065a91 100755
--- a/install.sh
+++ b/install.sh
@@ -29,14 +29,14 @@ prerequisites() {
   if which zsh > /dev/null 2>&1 ; then
     case $- in
       *i*)
-        case `getent passwd $USER | cut -d: -f7` in
+        case $(getent passwd $USER | cut -d: -f7) in
           */zsh)
             ;;
           *)
-            if [ `id` -ne 0 ] ; then
+            if [ $(id) -ne 0 ] ; then
               echo 'Enter password to change shell.' >&2
             fi
-            chsh -s `which zsh`
+            chsh -s $(which zsh)
             ;;
         esac
         ;;
@@ -91,7 +91,7 @@ install_basic_dir() {
   find "${SRCDIR}" ${FINDTYPE} f -print | \
     while read file ; do
     local TARGET="${2}/${file#${SRCDIR}/}"
-    mkdir -p `dirname "${TARGET}"`
+    mkdir -p $(dirname "${TARGET}")
     ln -s -f "${file}" "${TARGET}"
   done
 }
@@ -116,7 +116,7 @@ install_git() {
 }
 
 add_bin_symlink() {
-  local LINKNAME=${HOME}/bin/${2:-`basename $1`}
+  local LINKNAME=${HOME}/bin/${2:-$(basename $1)}
   if [ -e ${LINKNAME} -a ! -h ${LINKNAME} ] ; then
     echo "Refusing to overwrite ${LINKNAME}" >&2
     return 1
@@ -134,15 +134,15 @@ ssh_key_already_installed() {
   if [ ! -f $AK ] ; then
     return 1
   fi
-  local KEYFP=`ssh-keygen -l -f $1 2>/dev/null | awk '{print $2}'`
-  local TMPF=`mktemp`
+  local KEYFP=$(ssh-keygen -l -f $1 2>/dev/null | awk '{print $2}')
+  local TMPF=$(mktemp)
   local key
   while read key ; do
     if is_comment "${key}" ; then
       continue
     fi
     echo "$key" > $TMPF
-    local EFP=`ssh-keygen -l -f ${TMPF} 2>/dev/null | awk '{print $2}'`
+    local EFP=$(ssh-keygen -l -f ${TMPF} 2>/dev/null | awk '{print $2}')
     if [ "$EFP" = "$KEYFP" ] ; then
       rm $TMPF 2>/dev/null
       return 0
@@ -168,10 +168,10 @@ install_ssh_keys() {
       continue
     fi
     if ssh_key_already_installed "${key}" ; then
-      verbose "Key `basename ${key}` already installed..."
+      verbose "Key $(basename ${key}) already installed..."
       continue
     fi
-    echo "# `basename ${key}` added from skel on `date +%Y-%m-%d`" >> ${AK}
+    echo "# $(basename ${key}) added from skel on $(date +%Y-%m-%d)" >> ${AK}
     cat ${key} >> ${AK}
   done
 }
@@ -192,7 +192,7 @@ install_known_hosts() {
   fi
   mkdir -p ${HOME}/.ssh
   if [ -f "${HOME}/.ssh/known_hosts" ] ; then
-    local tmpf=`mktemp`
+    local tmpf=$(mktemp)
     cat ${BASEDIR}/keys/known_hosts ${HOME}/.ssh/known_hosts | sort -u > $tmpf
     mv $tmpf ${HOME}/.ssh/known_hosts
   else
@@ -264,8 +264,8 @@ install_apt_pkgs() {
 }
 
 install_chrome() {
-  local TMPD=`mktemp -d`
-  local CHROME_ARCH=`echo ${ARCH} | sed 's/x86_64/amd64/'`
+  local TMPD=$(mktemp -d)
+  local CHROME_ARCH=$(echo ${ARCH} | sed 's/x86_64/amd64/')
   dpkg-query -l 'google-chrome*' >/dev/null 2>&1 && return 0
   /usr/bin/wget --quiet -O ${TMPD}/google-chrome.deb \
     https://dl.google.com/linux/direct/google-chrome-beta_current_${CHROME_ARCH}.deb
@@ -277,8 +277,8 @@ install_chrome() {
 
 read_saved_prefs() {
   # Can't use basedir here as we don't have it yet
-  local old_pref_file=`dirname $0`/installed-prefs
-  local pref_file=`dirname $0`/.installed-prefs
+  local old_pref_file=$(dirname $0)/installed-prefs
+  local pref_file=$(dirname $0)/.installed-prefs
   if [ -f ${old_pref_file} -a ! -f ${pref_file} ] ; then
     mv ${old_pref_file} ${pref_file}
   fi