Merge pull request #187 from Automattic/pltfrm-2068-permissionnot-found-errors-in-lando-entrypoint-scripts

fix: bugs in entrypoint scripts

Author: sjinks

plugins/lando-core/scripts/lando-entrypoint.sh

@@ -28,7 +28,7 @@ if [ ! -f "/tmp/lando-started" ]; then
 fi
 
 # Executable all the helpers
-if [ -d "/helpers" ]; then
+if [ -d "/helpers" ] && [ -w "/helpers" ]; then
   chmod +x /helpers/* || true
 fi;
 

plugins/lando-core/scripts/user-perm-helpers.sh

@@ -77,7 +77,9 @@ perm_sweep() {
   local OTHER_DIR=$3
 
   # Start with the directories that are likely blockers
-  chown -R $USER:$GROUP /usr/local/bin
+  if [ -d /usr/local/bin ]; then
+    chown -R "${USER}:${GROUP}" /usr/local/bin
+  fi
   chown $USER:$GROUP /var/www
   chown $USER:$GROUP /app
   chmod 755 /var/www
@@ -89,18 +91,19 @@ perm_sweep() {
 
   # Do a background sweep
   nohup find /app -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
-  nohup find /var/www/.ssh -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
   nohup find /user/.ssh -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
   nohup find /var/www -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
-  nohup find /usr/local/bin -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
   nohup chmod -R 755 /var/www >/dev/null 2>&1 &
-
-  # Lets also make some /usr/locals chowned
-  nohup find /usr/local/lib -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
-  nohup find /usr/local/share -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
-  nohup find /usr/local -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
+  if [ -d /usr/local ]; then
+    nohup find /usr/local -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
+  fi
 
   # Make sure we chown the $USER home directory
-  nohup find $(getent passwd $USER | cut -d : -f 6) -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
+  if command -v getent > /dev/null 2>&1; then
+    home_dir="$(getent passwd $USER | cut -d : -f 6)"
+    if [ -n "${home_dir}" ] && [ -d "${home_dir}" ]; then
+      nohup find "${home_dir}" -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
+    fi
+  fi
   nohup find /lando -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
 }

plugins/lando-core/scripts/user-perms.sh

@@ -101,4 +101,4 @@ lando_info "$LANDO_WEBROOT_USER:$LANDO_WEBROOT_GROUP is now running as $(id $LAN
 # Make sure we set the ownership of the mount and HOME when we start a service
 lando_info "And here. we. go."
 lando_info "Doing the permission sweep."
-perm_sweep $LANDO_WEBROOT_USER $(getent group "$LANDO_HOST_GID" | cut -d: -f1) $LANDO_RESET_DIR
+perm_sweep $LANDO_WEBROOT_USER "${LANDO_HOST_GID}" $LANDO_RESET_DIR