diff --git a/install b/scripts/install.sh similarity index 92% rename from install rename to scripts/install.sh index d0491df4..b50144ee 100644 --- a/install +++ b/scripts/install.sh @@ -176,13 +176,14 @@ if [ ! -e $THEME_SET_FILE ]; then # setup theme php artisan theme:set $THEME_NAME + # set write perms on published views + for MODULE in `ls resources/views/modules`; do + chmod 0777 resources/views/modules/$MODULE/visitor/$THEME_NAME -R + done + echo $THEME_NAME > $THEME_SET_FILE fi -# publish assets and views -php artisan vendor:publish --tag=module-views -php artisan vendor:publish --tag=public-assets - if [ ! -e $ADMIN_CREATED_FILE ]; then echo "" echo " ------------------------------ " @@ -203,9 +204,19 @@ if [ ! -e $ADMIN_CREATED_FILE ]; then echo $EMAIL > $ADMIN_CREATED_FILE fi +echo "" +echo " -----------------------------------" +echo " * GIT BRANCH *" + +echo "" +echo "Create new Git branch? (n for no)" +read NEW_GIT_BRANCH + # create new branch in git -git checkout -b $WEBSITE_DOMAIN -git push origin $WEBSITE_DOMAIN +if [ "$NEW_GIT_BRANCH" != "n" ]; then + git checkout -b $WEBSITE_DOMAIN + git push origin $WEBSITE_DOMAIN +fi # save info about user, who installed this source copy echo $USER > $USER_INSTALLED_FILE diff --git a/scripts/update.sh b/scripts/update.sh new file mode 100644 index 00000000..775b4d0e --- /dev/null +++ b/scripts/update.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +echo "" +echo " UPDATE RUNNING IN $SCRIPT_PATH" +echo "" + +BRANCH=`cat $SCRIPT_PATH/../.install/.website_domain 2> /dev/null` + +if [ ! $? -eq 0 ]; then + echo "Which Git branch should I track?" + + git branch + + echo " select one (empty for abort): " + read BRANCH + + if [ "$BRANCH" == "" ]; then + echo " ... aborting" + exit 1 + fi + + if [ ! -d "../.install" ]; then + mkdir ../.install + fi + + echo $BRANCH > $SCRIPT_PATH/../.install/.website_domain +fi + +git checkout $BRANCH +git pull origin $BRANCH + +php artisan migrate +php artisan vendor:publish --tag=module-views --force +php artisan vendor:publish --tag=public-assets --force + +composer install --no-dev