Bob Mottram 7 år sedan
förälder
incheckning
2b95fb89c3
1 ändrade filer med 7 tillägg och 7 borttagningar
  1. 7
    7
      src/freedombone-template

+ 7
- 7
src/freedombone-template Visa fil

@@ -396,10 +396,10 @@ fi
396 396
 echo ''
397 397
 echo '    # update to the next commit'
398 398
 if [ ! "$app_dir" ]; then
399
-    echo "    set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \$${app_name_upper}_REPO"
399
+    echo "    set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
400 400
     echo "    chown -R www-data:www-data \"/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs\""
401 401
 else
402
-    echo "    set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \$${app_name_upper}_REPO"
402
+    echo "    set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
403 403
     echo "    chown -R ${app_name}:${app_name} \"${app_dir}\""
404 404
 fi
405 405
 echo '}'
@@ -663,7 +663,7 @@ fi
663 663
 if [[ "$database_type" == "postgres"* ]]; then
664 664
     echo "    drop_database_postgresql ${app_name}"
665 665
 fi
666
-echo "    remove_onion_service ${app_name} \${${app_name_upper}_ONION_PORT}"
666
+echo "    remove_onion_service ${app_name} \"\${${app_name_upper}_ONION_PORT}\""
667 667
 echo "    if grep -q \"${app_name}\" /etc/crontab; then"
668 668
 echo "        sed -i \"/${app_name}/d\" /etc/crontab"
669 669
 echo '    fi'
@@ -729,9 +729,9 @@ fi
729 729
 echo '          git pull'
730 730
 echo '      else'
731 731
 if [ ! "$app_dir" ]; then
732
-    echo "          git_clone \$${app_name_upper}_REPO \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
732
+    echo "          git_clone \"\$${app_name_upper}_REPO\" \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
733 733
 else
734
-    echo "          git_clone \$${app_name_upper}_REPO \"${app_dir}\""
734
+    echo "          git_clone \"\$${app_name_upper}_REPO\" \"${app_dir}\""
735 735
 fi
736 736
 echo '      fi'
737 737
 echo ''
@@ -749,7 +749,7 @@ if [ ! "$app_dir" ]; then
749 749
 else
750 750
     echo "    cd \"${app_dir}\" || exit 3463754637"
751 751
 fi
752
-echo "    git checkout \$${app_name_upper}_COMMIT -b \$${app_name_upper}_COMMIT"
752
+echo "    git checkout \"\$${app_name_upper}_COMMIT\" -b \"\$${app_name_upper}_COMMIT\""
753 753
 echo "    set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\""
754 754
 if [ $app_webui ]; then
755 755
     echo ''
@@ -766,7 +766,7 @@ if [ $app_webui ]; then
766 766
     echo "    add_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\""
767 767
 fi
768 768
 echo ''
769
-echo "    ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \${${app_name_upper}_ONION_PORT})"
769
+echo "    ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \"\${${app_name_upper}_ONION_PORT}\")"
770 770
 
771 771
 if [ $app_webui ]; then
772 772
     echo ''