From: Chris Koeritz Date: Sat, 4 Nov 2017 23:49:29 +0000 (-0400) Subject: fixing extensions X-Git-Tag: 2.140.90~83 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=46da48836dd0d44a6f7a9129b516d5a5eb2fe223;p=feisty_meow.git fixing extensions --- diff --git a/scripts/site_avenger/avcoreup b/scripts/site_avenger/avcoreup deleted file mode 100644 index 7ae0b6ba..00000000 --- a/scripts/site_avenger/avcoreup +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -# Author: Kevin Wentworth -# Author: Chris Koeritz - -# updates just the site avenger core portion of an app. - -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - -# get our defaults. -source "$WORKDIR/site_avenger.config" - -############################ - -# main body of script. - -# check for parameters. -app_dirname="$1"; shift - -sep - -check_application_dir "$APPLICATION_DIR" - -# find proper webroot where the site will be initialized. -if [ -z "$app_dirname" ]; then - # no dir was passed, so guess it. - find_app_folder "$APPLICATION_DIR" -else - test_app_folder "$APPLICATION_DIR" "$app_dirname" -fi - -# where we expect to find our checkout folder underneath. -full_app_dir="$APPLICATION_DIR/$app_dirname" - -# simplistic approach here; just go to the folder and pull the changes. - -pushd "$full_app_dir" &>/dev/null -check_result "Changing to app path '$full_app_dir'" - -dir="avenger5/vendor/siteavenger/avcore" -if [ ! -d $dir ]; then - echo "The application doesn't seem to use avcore: $full_app_dir" -else - pushd "$dir" &>/dev/null - - git pull - check_result "Pulling git repo for avcore under '$full_app_dir'" - - echo "Finished updating the avcore portion of site in ${app_dirname}." - - popd &>/dev/null -fi - -popd &>/dev/null - -sep - diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh new file mode 100644 index 00000000..7ae0b6ba --- /dev/null +++ b/scripts/site_avenger/avcoreup.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +# Author: Kevin Wentworth +# Author: Chris Koeritz + +# updates just the site avenger core portion of an app. + +export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +source "$WORKDIR/shared_site_mgr.sh" + +# get our defaults. +source "$WORKDIR/site_avenger.config" + +############################ + +# main body of script. + +# check for parameters. +app_dirname="$1"; shift + +sep + +check_application_dir "$APPLICATION_DIR" + +# find proper webroot where the site will be initialized. +if [ -z "$app_dirname" ]; then + # no dir was passed, so guess it. + find_app_folder "$APPLICATION_DIR" +else + test_app_folder "$APPLICATION_DIR" "$app_dirname" +fi + +# where we expect to find our checkout folder underneath. +full_app_dir="$APPLICATION_DIR/$app_dirname" + +# simplistic approach here; just go to the folder and pull the changes. + +pushd "$full_app_dir" &>/dev/null +check_result "Changing to app path '$full_app_dir'" + +dir="avenger5/vendor/siteavenger/avcore" +if [ ! -d $dir ]; then + echo "The application doesn't seem to use avcore: $full_app_dir" +else + pushd "$dir" &>/dev/null + + git pull + check_result "Pulling git repo for avcore under '$full_app_dir'" + + echo "Finished updating the avcore portion of site in ${app_dirname}." + + popd &>/dev/null +fi + +popd &>/dev/null + +sep + diff --git a/scripts/site_avenger/powerup b/scripts/site_avenger/powerup deleted file mode 100644 index 74982616..00000000 --- a/scripts/site_avenger/powerup +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Author: Kevin Wentworth -# Author: Chris Koeritz - -# This script "powers up" a cakephp site by running the database migrations, -# cleaning out the ORM cache, and fixing file permissions. -# Note that the mysql database must already exist and allow permissions to -# the configured username/password in config/app.php. -# This script is currently highly specific to site avenger. - -# General Info: -# -# The naming scheme here is a little complex, but it's basically this... -# A git repository is expected to be provided, and we will get all the code -# for the web site from there. The repository is expected to have a single -# application "name" and one or more "themes". By convention, the name -# and the theme are often the same. -# For example, let's say our app name is "turtle" and our theme name is "box". -# The repo is checked out to a folder called "~/apps/turtle". -# This script will want to use "turtle" as the app name. -# It will have to be told the theme name, but will assume it's 'Turtle' to -# start with. The concept of the theme comes from cakephp. - -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - -# get our defaults. -source "$WORKDIR/site_avenger.config" - -############################ - -# main body of script. - -# check for parameters. -app_dirname="$1"; shift -repo_name="$1"; shift -theme_name="$1"; shift - -sep - -check_application_dir "$APPLICATION_DIR" - -# find proper webroot where the site will be initialized. -if [ -z "$app_dirname" ]; then - # no dir was passed, so guess it. - find_app_folder "$APPLICATION_DIR" -else - test_app_folder "$APPLICATION_DIR" "$app_dirname" -fi - -# where we expect to find our checkout folder underneath. -full_app_dir="$APPLICATION_DIR/$app_dirname" - -# use our default values for the repository and theme if they're not provided. -if [ -z "$repo_name" ]; then - repo_name="$app_dirname" -fi -if [ -z "$theme_name" ]; then - theme_name="$(capitalize_first_char ${app_dirname})" -fi - -echo "Repository: $repo_name" -echo "Theme name: $theme_name" -sep - -# this should set the site_store_path variable if everything goes well. -update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" -check_result "Updating the repository storage directory" - -# update the site to load dependencies. -sep -composer_repuff "$site_store_path" -check_result "Installing site dependencies with composer" - -# set up the symbolic links needed to achieve siteliness. -sep - -create_site_links "$site_store_path" "$theme_name" - -sep - -echo "Finished powering up the site in '${app_dirname}'." - diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh new file mode 100644 index 00000000..74982616 --- /dev/null +++ b/scripts/site_avenger/powerup.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# Author: Kevin Wentworth +# Author: Chris Koeritz + +# This script "powers up" a cakephp site by running the database migrations, +# cleaning out the ORM cache, and fixing file permissions. +# Note that the mysql database must already exist and allow permissions to +# the configured username/password in config/app.php. +# This script is currently highly specific to site avenger. + +# General Info: +# +# The naming scheme here is a little complex, but it's basically this... +# A git repository is expected to be provided, and we will get all the code +# for the web site from there. The repository is expected to have a single +# application "name" and one or more "themes". By convention, the name +# and the theme are often the same. +# For example, let's say our app name is "turtle" and our theme name is "box". +# The repo is checked out to a folder called "~/apps/turtle". +# This script will want to use "turtle" as the app name. +# It will have to be told the theme name, but will assume it's 'Turtle' to +# start with. The concept of the theme comes from cakephp. + +export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +source "$WORKDIR/shared_site_mgr.sh" + +# get our defaults. +source "$WORKDIR/site_avenger.config" + +############################ + +# main body of script. + +# check for parameters. +app_dirname="$1"; shift +repo_name="$1"; shift +theme_name="$1"; shift + +sep + +check_application_dir "$APPLICATION_DIR" + +# find proper webroot where the site will be initialized. +if [ -z "$app_dirname" ]; then + # no dir was passed, so guess it. + find_app_folder "$APPLICATION_DIR" +else + test_app_folder "$APPLICATION_DIR" "$app_dirname" +fi + +# where we expect to find our checkout folder underneath. +full_app_dir="$APPLICATION_DIR/$app_dirname" + +# use our default values for the repository and theme if they're not provided. +if [ -z "$repo_name" ]; then + repo_name="$app_dirname" +fi +if [ -z "$theme_name" ]; then + theme_name="$(capitalize_first_char ${app_dirname})" +fi + +echo "Repository: $repo_name" +echo "Theme name: $theme_name" +sep + +# this should set the site_store_path variable if everything goes well. +update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" +check_result "Updating the repository storage directory" + +# update the site to load dependencies. +sep +composer_repuff "$site_store_path" +check_result "Installing site dependencies with composer" + +# set up the symbolic links needed to achieve siteliness. +sep + +create_site_links "$site_store_path" "$theme_name" + +sep + +echo "Finished powering up the site in '${app_dirname}'." + diff --git a/scripts/site_avenger/satis-refresh b/scripts/site_avenger/satis-refresh deleted file mode 100644 index eb002dde..00000000 --- a/scripts/site_avenger/satis-refresh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Author: Kevin Wentworth - -#hmmm: have not done anything with this yet. - -# Reference: -# http://askubuntu.com/a/465113 - where to put scripts -# chmod +x satis-refresh - for execute permissions - -cd /srv/users/avenger/apps/avenger-packages/satis - -php bin/satis build /srv/users/avenger/apps/avenger-packages/satis/satis.json /srv/users/avenger/apps/avenger-packages/public -n - -echo "DONE" diff --git a/scripts/site_avenger/satis-refresh.sh b/scripts/site_avenger/satis-refresh.sh new file mode 100644 index 00000000..eb002dde --- /dev/null +++ b/scripts/site_avenger/satis-refresh.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Author: Kevin Wentworth + +#hmmm: have not done anything with this yet. + +# Reference: +# http://askubuntu.com/a/465113 - where to put scripts +# chmod +x satis-refresh - for execute permissions + +cd /srv/users/avenger/apps/avenger-packages/satis + +php bin/satis build /srv/users/avenger/apps/avenger-packages/satis/satis.json /srv/users/avenger/apps/avenger-packages/public -n + +echo "DONE" diff --git a/scripts/site_avenger/sitepush b/scripts/site_avenger/sitepush deleted file mode 100644 index 99a8cbef..00000000 --- a/scripts/site_avenger/sitepush +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -# Author: Kevin Wentworth -# Author: Chris Koeritz - -# checks the chosen site into the online git repository. - -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - -# get our defaults. -source "$WORKDIR/site_avenger.config" - -############################ - -# main body of script. - -# check for parameters. -app_dirname="$1"; shift -repo_name="$1"; shift - -sep - -check_application_dir "$APPLICATION_DIR" - -# find proper webroot where the site will be initialized. -if [ -z "$app_dirname" ]; then - # no dir was passed, so guess it. - find_app_folder "$APPLICATION_DIR" -else - test_app_folder "$APPLICATION_DIR" "$app_dirname" -fi - -# where we expect to find our checkout folder underneath. -full_app_dir="$APPLICATION_DIR/$app_dirname" - -# use our default values for the repository and theme if they're not provided. -if [ -z "$repo_name" ]; then - repo_name="$app_dirname" -fi - -echo "Repository: $repo_name" -sep - -# this should set the site_store_path variable if everything goes well. -update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" -check_result "Updating the repository storage directory" - -sep - -update_composer_repository "$site_store_path" - -sep - -# now finally do the real check-in for our site. - -pushd "$site_store_path" &>/dev/null -rcheckin - -sep - -echo "Finished checking in the site at ${app_dirname}." - - - - - - -echo bailing before deprecated code is run.; exit 0 - - -# see if there are any unmerged files, if so, do not try to push files -if [[ `git ls-files -u` ]]; then - echo "Git: local changes!" - echo "Aborting. Please resolve manually and re-run this script" -else - # http://stackoverflow.com/questions/5143795/how-can-i-check-in-a-bash-script-if-my-local-git-repo-has-changes - # see if there are any new files that need pushing (status will show new files) - if [[ `git status --porcelain` ]]; then - # changes - git add . -A - git commit -m "SERVER. Adding user uploaded files. [via sitepush]" - git push origin master - echo "Git: changes pushed to [master]" - else - # no changes - echo "Git: nothing to push. [master] up to date." - fi -fi - -#### - - diff --git a/scripts/site_avenger/sitepush.sh b/scripts/site_avenger/sitepush.sh new file mode 100644 index 00000000..99a8cbef --- /dev/null +++ b/scripts/site_avenger/sitepush.sh @@ -0,0 +1,93 @@ +#!/bin/bash + +# Author: Kevin Wentworth +# Author: Chris Koeritz + +# checks the chosen site into the online git repository. + +export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +source "$WORKDIR/shared_site_mgr.sh" + +# get our defaults. +source "$WORKDIR/site_avenger.config" + +############################ + +# main body of script. + +# check for parameters. +app_dirname="$1"; shift +repo_name="$1"; shift + +sep + +check_application_dir "$APPLICATION_DIR" + +# find proper webroot where the site will be initialized. +if [ -z "$app_dirname" ]; then + # no dir was passed, so guess it. + find_app_folder "$APPLICATION_DIR" +else + test_app_folder "$APPLICATION_DIR" "$app_dirname" +fi + +# where we expect to find our checkout folder underneath. +full_app_dir="$APPLICATION_DIR/$app_dirname" + +# use our default values for the repository and theme if they're not provided. +if [ -z "$repo_name" ]; then + repo_name="$app_dirname" +fi + +echo "Repository: $repo_name" +sep + +# this should set the site_store_path variable if everything goes well. +update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" +check_result "Updating the repository storage directory" + +sep + +update_composer_repository "$site_store_path" + +sep + +# now finally do the real check-in for our site. + +pushd "$site_store_path" &>/dev/null +rcheckin + +sep + +echo "Finished checking in the site at ${app_dirname}." + + + + + + +echo bailing before deprecated code is run.; exit 0 + + +# see if there are any unmerged files, if so, do not try to push files +if [[ `git ls-files -u` ]]; then + echo "Git: local changes!" + echo "Aborting. Please resolve manually and re-run this script" +else + # http://stackoverflow.com/questions/5143795/how-can-i-check-in-a-bash-script-if-my-local-git-repo-has-changes + # see if there are any new files that need pushing (status will show new files) + if [[ `git status --porcelain` ]]; then + # changes + git add . -A + git commit -m "SERVER. Adding user uploaded files. [via sitepush]" + git push origin master + echo "Git: changes pushed to [master]" + else + # no changes + echo "Git: nothing to push. [master] up to date." + fi +fi + +#### + + diff --git a/scripts/site_avenger/siteup b/scripts/site_avenger/siteup deleted file mode 100644 index 205f342e..00000000 --- a/scripts/site_avenger/siteup +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# Author: Kevin Wentworth -# Author: Chris Koeritz - -# updates a site avenger app. - -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - -# get our defaults. -source "$WORKDIR/site_avenger.config" - -############################ - -# main body of script. - -# check for parameters. -app_dirname="$1"; shift -repo_name="$1"; shift - -sep - -check_application_dir "$APPLICATION_DIR" - -# find proper webroot where the site will be initialized. -if [ -z "$app_dirname" ]; then - # no dir was passed, so guess it. - find_app_folder "$APPLICATION_DIR" -else - test_app_folder "$APPLICATION_DIR" "$app_dirname" -fi - -# where we expect to find our checkout folder underneath. -full_app_dir="$APPLICATION_DIR/$app_dirname" - -# use our default values for the repository and theme if they're not provided. -if [ -z "$repo_name" ]; then - repo_name="$app_dirname" -fi - -echo "Repository: $repo_name" -sep - -# this should set the site_store_path variable if everything goes well. -update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" -check_result "Updating the repository storage directory" - -#### - -sep - -echo "Finished updating the site in ${app_dirname}." - diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh new file mode 100644 index 00000000..205f342e --- /dev/null +++ b/scripts/site_avenger/siteup.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +# Author: Kevin Wentworth +# Author: Chris Koeritz + +# updates a site avenger app. + +export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +source "$WORKDIR/shared_site_mgr.sh" + +# get our defaults. +source "$WORKDIR/site_avenger.config" + +############################ + +# main body of script. + +# check for parameters. +app_dirname="$1"; shift +repo_name="$1"; shift + +sep + +check_application_dir "$APPLICATION_DIR" + +# find proper webroot where the site will be initialized. +if [ -z "$app_dirname" ]; then + # no dir was passed, so guess it. + find_app_folder "$APPLICATION_DIR" +else + test_app_folder "$APPLICATION_DIR" "$app_dirname" +fi + +# where we expect to find our checkout folder underneath. +full_app_dir="$APPLICATION_DIR/$app_dirname" + +# use our default values for the repository and theme if they're not provided. +if [ -z "$repo_name" ]; then + repo_name="$app_dirname" +fi + +echo "Repository: $repo_name" +sep + +# this should set the site_store_path variable if everything goes well. +update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" +check_result "Updating the repository storage directory" + +#### + +sep + +echo "Finished updating the site in ${app_dirname}." +