This commit is contained in:
Bob Mottram 2018-04-08 17:57:09 +01:00
parent 06336167a3
commit 2b95fb89c3
1 changed files with 7 additions and 7 deletions

View File

@ -396,10 +396,10 @@ fi
echo '' echo ''
echo ' # update to the next commit' echo ' # update to the next commit'
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
echo " set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \$${app_name_upper}_REPO" echo " set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
echo " chown -R www-data:www-data \"/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs\"" echo " chown -R www-data:www-data \"/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs\""
else else
echo " set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \$${app_name_upper}_REPO" echo " set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
echo " chown -R ${app_name}:${app_name} \"${app_dir}\"" echo " chown -R ${app_name}:${app_name} \"${app_dir}\""
fi fi
echo '}' echo '}'
@ -663,7 +663,7 @@ fi
if [[ "$database_type" == "postgres"* ]]; then if [[ "$database_type" == "postgres"* ]]; then
echo " drop_database_postgresql ${app_name}" echo " drop_database_postgresql ${app_name}"
fi fi
echo " remove_onion_service ${app_name} \${${app_name_upper}_ONION_PORT}" echo " remove_onion_service ${app_name} \"\${${app_name_upper}_ONION_PORT}\""
echo " if grep -q \"${app_name}\" /etc/crontab; then" echo " if grep -q \"${app_name}\" /etc/crontab; then"
echo " sed -i \"/${app_name}/d\" /etc/crontab" echo " sed -i \"/${app_name}/d\" /etc/crontab"
echo ' fi' echo ' fi'
@ -729,9 +729,9 @@ fi
echo ' git pull' echo ' git pull'
echo ' else' echo ' else'
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
echo " git_clone \$${app_name_upper}_REPO \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\"" echo " git_clone \"\$${app_name_upper}_REPO\" \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
else else
echo " git_clone \$${app_name_upper}_REPO \"${app_dir}\"" echo " git_clone \"\$${app_name_upper}_REPO\" \"${app_dir}\""
fi fi
echo ' fi' echo ' fi'
echo '' echo ''
@ -749,7 +749,7 @@ if [ ! "$app_dir" ]; then
else else
echo " cd \"${app_dir}\" || exit 3463754637" echo " cd \"${app_dir}\" || exit 3463754637"
fi fi
echo " git checkout \$${app_name_upper}_COMMIT -b \$${app_name_upper}_COMMIT" echo " git checkout \"\$${app_name_upper}_COMMIT\" -b \"\$${app_name_upper}_COMMIT\""
echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\"" echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\""
if [ $app_webui ]; then if [ $app_webui ]; then
echo '' echo ''
@ -766,7 +766,7 @@ if [ $app_webui ]; then
echo " add_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\"" echo " add_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\""
fi fi
echo '' echo ''
echo " ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \${${app_name_upper}_ONION_PORT})" echo " ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \"\${${app_name_upper}_ONION_PORT}\")"
if [ $app_webui ]; then if [ $app_webui ]; then
echo '' echo ''