reversed polarity, so now FEISTY_MEOW_REPOS_SCAN

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm_v002.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm_v002.sh b/scripts/site_avenger/revamp_cakelampvm_v002.sh
index 205fcb4c91afbf23ed985d9fd146c812b7107dbe..bfbcb194fab36a7ff28af96da0114156815aa466 100644 (file)
--- 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,12 @@ 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"
+
+#hmmm: argh, wrong check!  can't check a multi-value if it's a directory or not!!!
+if [ -d "$FEISTY_MEOW_REPOS_SCAN" ]; then
+  group_perm $FEISTY_MEOW_REPOS_SCAN
+  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 +348,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 +382,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 "