X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm_v002.sh;h=93d0302cfa396737e93f108779164a930ae92f97;hb=433e814670acb50888d9d58b5f77cfa948b23aa9;hp=205fcb4c91afbf23ed985d9fd146c812b7107dbe;hpb=79562d8c24ba1d79fb91ab22ca0d534bc77efac0;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm_v002.sh b/scripts/site_avenger/revamp_cakelampvm_v002.sh
index 205fcb4c..93d0302c 100644
--- a/scripts/site_avenger/revamp_cakelampvm_v002.sh
+++ b/scripts/site_avenger/revamp_cakelampvm_v002.sh
@@ -47,7 +47,7 @@ echo "Regenerating feisty meow loading dock."
 
 regenerate
 exit_on_error "regenerating feisty meow configuration"
-chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+chown -R "$(fm_username)":"$(fm_username)" /home/$(fm_username)/.[a-zA-Z0-9]*
 exit_on_error "fix after reconfigured as sudo"
 
 ##############
@@ -112,8 +112,10 @@ exit_on_error "group perms on feisty meow"
 # fix perms for fred user.
 chown -R fred:fred /home/fred /home/archives/stuffing /home/fred/.[a-zA-Z0-9]*
 exit_on_error "chown fred home"
-group_perm $HOME/apps
-exit_on_error "group perms on fred's apps"
+if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then
+  group_perm $FEISTY_MEOW_APPS_DIR
+  exit_on_error "group perms on fred's apps"
+fi
 harsh_perm /home/fred/.ssh
 exit_on_error "harsh_perm setting on fred .ssh"
 group_perm /home/fred/apps/mapsdemo
@@ -344,7 +346,7 @@ sep
 echo Adding site avenger packages to composer.
 # add in site avenger dependencies so we can build avcore properly.
 pushd ~ &>/dev/null
-sudo -u $(logname) composer config -g repositories.siteavenger composer https://packages.siteavenger.com/
+sudo -u $(fm_username) composer config -g repositories.siteavenger composer https://packages.siteavenger.com/
 popd &>/dev/null
 
 ##############
@@ -378,7 +380,7 @@ sep
 
 regenerate
 exit_on_error "regenerating feisty meow scripts"
-chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+chown -R "$(fm_username)":"$(fm_username)" /home/$(fm_username)/.[a-zA-Z0-9]*
 exit_on_error "fix after regenerate as sudo"
 echo "