From 7732a53caedd6e81d9f1872a5850a7b61c5562c5 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sun, 12 Nov 2017 21:42:29 -0500 Subject: [PATCH] trying a different way to drop perms --- scripts/site_avenger/powerup.sh | 21 +++++++++++---------- scripts/site_avenger/standup.sh | 11 ++--------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh index cf8a5c43..828057c6 100644 --- a/scripts/site_avenger/powerup.sh +++ b/scripts/site_avenger/powerup.sh @@ -27,14 +27,15 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's work function print_instructions() { echo - echo "$(basename $0 .sh) [app dirname] [repository] [theme name] [user name]" + echo "$(basename $0 .sh) [app dirname] [repository] [theme name] " +#[user name] echo echo "All parameters are optional, and intelligent guesses for them will be made." echo echo "app dirname: The folder where the app will be stored." echo "repository: The name of the git repository (short version, no URL)." echo "theme name: The name to use for the cakephp theme." - echo "user name: The name of the user to chown the checkout to." +# echo "user name: The name of the user to chown the checkout to." echo exit 0 } @@ -47,9 +48,9 @@ function print_instructions() app_dirname="$1"; shift repo_name="$1"; shift theme_name="$1"; shift -user_name="$1"; shift +#user_name="$1"; shift -echo "*** user name is $user_name" +#echo "*** user name is $user_name" if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions @@ -103,12 +104,12 @@ create_site_links "$site_store_path" "$theme_name" sep -if [ ! -z "$user_name" ]; then - echo "Chowning the apps folder to be owned by: $user_name" -#hmmm: have to hope for now for standard group named after user - chown -R "$user_name:$user_name" "$APPLICATION_DIR" - test_or_die "Chowning $APPLICATION_DIR to be owned by $user_name" -fi +#if [ ! -z "$user_name" ]; then +# echo "Chowning the apps folder to be owned by: $user_name" +##hmmm: have to hope for now for standard group named after user +# chown -R "$user_name:$user_name" "$APPLICATION_DIR" +# test_or_die "Chowning $APPLICATION_DIR to be owned by $user_name" +#fi sep diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index 4b97c9ca..d79f7f7e 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -81,16 +81,9 @@ sep echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME" echo default repo is "$DEFAULT_REPOSITORY_ROOT" -#hmmm: maybe can get rid of user name parm if this works? -echo before redo login permissions -sudo su -i -u $(logname) -echo after redo login permissions -whoami -echo user=$USER - - # pass the real user name who should own the files. -powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" "$(logname)" +sudo su -u $(logname) bash "$WORKDIR/powerup.sh" "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" +# "$(logname)" sep -- 2.34.1