fixup! install.sh: Add remote install support

Author: nhooyr

install.sh

@@ -156,12 +156,12 @@ main() {
     echoerr "Run with --help to see usage."
     exit 1
   fi
-  RHOME="$(sh_c_f printenv HOME)"
-  STANDALONE_INSTALL_PREFIX="${STANDALONE_INSTALL_PREFIX-$HOME/.local}"
+  RHOME="$(sh_f printenv HOME)"
+  STANDALONE_INSTALL_PREFIX="${STANDALONE_INSTALL_PREFIX-$RHOME/.local}"
 
   OS="$(os)"
   if [ ! "$OS" ]; then
-    echoerr "Unsupported OS $(uname)."
+    echoerr "Unsupported OS $(sh_f uname)."
     exit 1
   fi
 
@@ -170,11 +170,11 @@ main() {
   ARCH="$(arch)"
   if [ ! "$ARCH" ]; then
     if [ "$METHOD" = standalone ]; then
-      echoerr "No precompiled releases for $(sh_c_f uname -m)."
+      echoerr "No precompiled releases for $(sh_f uname -m)."
       echoerr 'Please rerun without the "--method standalone" flag to install from npm.'
       exit 1
     fi
-    echoh "No precompiled releases for $(sh_c_f uname -m)."
+    echoh "No precompiled releases for $(sh_f uname -m)."
     install_npm
     return
   fi
@@ -311,7 +311,7 @@ install_aur() {
   sh_c mkdir -p "$CACHE_DIR/code-server-aur"
   sh_c "curl -#fsSL https://aur.archlinux.org/cgit/aur.git/snapshot/code-server.tar.gz | tar -xzC $CACHE_DIR/code-server-aur --strip-components 1"
   echo "+ cd $CACHE_DIR/code-server-aur"
-  if [ ! "${DRY_RUN-}" ]; then
+  if sh_f [ ! "${DRY_RUN-}" ]; then
     cd "$CACHE_DIR/code-server-aur"
   fi
   sh_c makepkg -si
@@ -327,11 +327,11 @@ install_standalone() {
     "$CACHE_DIR/code-server-$VERSION-$OS-$ARCH.tar.gz"
 
   sh_c="sh_c"
-  if [ ! -w "$STANDALONE_INSTALL_PREFIX" ]; then
+  if sh-f [ ! -w "$STANDALONE_INSTALL_PREFIX" ]; then
     sh_c="sudo_sh_c"
   fi
 
-  if [ -e "$STANDALONE_INSTALL_PREFIX/lib/code-server-$VERSION" ]; then
+  if sh_f [ -e "$STANDALONE_INSTALL_PREFIX/lib/code-server-$VERSION" ]; then
     echoh
     echoh "code-server-$VERSION is already installed at $STANDALONE_INSTALL_PREFIX/lib/code-server-$VERSION"
     echoh "Remove it to reinstall."
@@ -349,7 +349,7 @@ install_standalone() {
 install_npm() {
   if command_exists yarn; then
     sh_c="sh_c"
-    if [ ! -w "$(yarn global bin)" ]; then
+    if sh_f [ ! -w "$(sh_f yarn global bin)" ]; then
       sh_c="sudo_sh_c"
     fi
     echoh "Installing with yarn."
@@ -358,7 +358,7 @@ install_npm() {
     return
   elif command_exists npm; then
     sh_c="sh_c"
-    if [ ! -w "$(npm config get prefix)" ]; then
+    if sh_f [ ! -w "$(sh_f npm config get prefix)" ]; then
       sh_c="sudo_sh_c"
     fi
     echoh "Installing with npm."
@@ -374,7 +374,7 @@ install_npm() {
 }
 
 os() {
-  case "$(sh_c_f uname)" in
+  case "$(sh_f uname)" in
   Linux)
     echo linux
     ;;
@@ -399,15 +399,14 @@ os() {
 #
 # Inspired by https://github.com/docker/docker-install/blob/26ff363bcf3b3f5a00498ac43694bf1c7d9ce16c/install.sh#L111-L120.
 distro() {
-  set -x
   if [ "$OS" = "macos" ] || [ "$OS" = "freebsd" ]; then
     echo "$OS"
     return
   fi
 
-  if sh_c_f [ -f /etc/os-release ]; then
+  if sh_f [ -f /etc/os-release ]; then
     (
-      ID="$(sh_c_f '. /etc/os-release && echo "$ID"')"
+      ID="$(sh_f '. /etc/os-release && echo "$ID"')"
       case "$ID" in opensuse-*)
         # opensuse's ID's look like opensuse-leap and opensuse-tumbleweed.
         echo "opensuse"
@@ -423,22 +422,22 @@ distro() {
 
 # os_name prints a pretty human readable name for the OS/Distro.
 distro_name() {
-  if [ "$(sh_c_f uname)" = "Darwin" ]; then
-    echo "macOS v$(sh_c_f sw_vers -productVersion)"
+  if [ "$(sh_f uname)" = "Darwin" ]; then
+    echo "macOS v$(sh_f sw_vers -productVersion)"
     return
   fi
 
-  if sh_c_f [ -f /etc/os-release ]; then
-    sh_c_f '. /etc/os-release && echo "$PRETTY_NAME"'
+  if sh_f [ -f /etc/os-release ]; then
+    sh_f '. /etc/os-release && echo "$PRETTY_NAME"'
     return
   fi
 
   # Prints something like: Linux 4.19.0-9-amd64
-  sh_c_f uname -sr
+  sh_f uname -sr
 }
 
 arch() {
-  case "$(sh_c_f uname -m)" in
+  case "$(sh_f uname -m)" in
   aarch64)
     echo arm64
     ;;
@@ -452,18 +451,18 @@ arch() {
 }
 
 command_exists() {
-  command -v "$@" > /dev/null 2>&1
+  sh_f command -v "$@" > /dev/null
 }
 
 sh_c() {
   echoh "+ $*"
   if [ ! "${DRY_RUN-}" ]; then
-    sh_c_f "$@"
+    sh_f "$@"
   fi
 }
 
 # Always runs.
-sh_c_f() {
+sh_f() {
   if [ "$SSH_ARGS" ]; then
     mkdir -p ~/.ssh/sockets
     ssh \
@@ -477,7 +476,7 @@ sh_c_f() {
 }
 
 sudo_sh_c() {
-  if [ "$(id -u)" = 0 ]; then
+  if [ "$(sh_f id -u)" = 0 ]; then
     sh_c "$@"
   elif command_exists sudo; then
     sh_c "sudo $*"
@@ -493,8 +492,8 @@ sudo_sh_c() {
 }
 
 echo_cache_dir() {
-  if [ "$(sh_c_f printenv XDG_CACHE_HOME)" ]; then
-    echo "$(sh_c_f printenv XDG_CACHE_HOME)/code-server"
+  if [ "$(sh_f printenv XDG_CACHE_HOME)" ]; then
+    echo "$(sh_f printenv XDG_CACHE_HOME)/code-server"
   elif [ "${RHOME-}" ]; then
     echo "$RHOME/.cache/code-server"
   else