|
@@ -32,7 +32,7 @@ app_name='noapp'
|
32
|
32
|
app_name_lower=$(echo "${app_name}" | tr '[:upper:]' '[:lower:]')
|
33
|
33
|
app_name=$app_name_lower
|
34
|
34
|
app_name_upper=$(echo "${app_name}" | tr '[:lower:]' '[:upper:]')
|
35
|
|
-app_repo="TODO"
|
|
35
|
+app_repo=
|
36
|
36
|
app_repo_commit='TODO'
|
37
|
37
|
app_php=
|
38
|
38
|
app_node=
|
|
@@ -75,6 +75,7 @@ function show_help {
|
75
|
75
|
echo $' -d --database [mariadb|postgresql|mongodb] Type of database'
|
76
|
76
|
echo $' -w --web [yes|no] Whether there is a web user interface (default is yes)'
|
77
|
77
|
echo $' --dir [directory] Where to install to'
|
|
78
|
+ echo $' -i --internalport [number] Internal port number for the daemon'
|
78
|
79
|
echo ''
|
79
|
80
|
exit 0
|
80
|
81
|
}
|
|
@@ -114,6 +115,10 @@ do
|
114
|
115
|
shift
|
115
|
116
|
database_type="$1"
|
116
|
117
|
;;
|
|
118
|
+ -i|--internal|--internalport)
|
|
119
|
+ shift
|
|
120
|
+ app_port_internal="$1"
|
|
121
|
+ ;;
|
117
|
122
|
-p|--php)
|
118
|
123
|
shift
|
119
|
124
|
app_php="$1"
|
|
@@ -263,8 +268,10 @@ if [ "$app_port" ]; then
|
263
|
268
|
echo "${app_name_upper}_PORT=$app_port"
|
264
|
269
|
fi
|
265
|
270
|
echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 ) + 9010 ))"
|
266
|
|
-echo "${app_name_upper}_REPO=\"${app_repo}\""
|
267
|
|
-echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
|
|
271
|
+if [ "$app_repo" ]; then
|
|
272
|
+ echo "${app_name_upper}_REPO=\"${app_repo}\""
|
|
273
|
+ echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
|
|
274
|
+fi
|
268
|
275
|
if [ $app_daemon ]; then
|
269
|
276
|
if [ ! "$app_port_internal" ]; then
|
270
|
277
|
echo "${app_name_upper}_PORT_INTERNAL=TODO"
|
|
@@ -391,27 +398,31 @@ echo ' done'
|
391
|
398
|
echo '}'
|
392
|
399
|
echo ''
|
393
|
400
|
echo "function upgrade_${app_name} {"
|
394
|
|
-echo " CURR_${app_name_upper}_COMMIT=\$(get_completion_param \"${app_name} commit\")"
|
395
|
|
-echo " if [[ \"\$CURR_${app_name_upper}_COMMIT\" == \"\$${app_name_upper}_COMMIT\" ]]; then"
|
396
|
|
-echo ' return'
|
397
|
|
-echo ' fi'
|
398
|
|
-if [ $app_webui ]; then
|
399
|
|
- echo ''
|
400
|
|
- echo " if grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then"
|
401
|
|
- echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")"
|
402
|
|
- echo ' fi'
|
403
|
|
-fi
|
404
|
|
-echo ''
|
405
|
|
-echo ' # update to the next commit'
|
406
|
|
-if [ ! "$app_dir" ]; then
|
407
|
|
- echo " set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
|
408
|
|
- echo " chown -R www-data:www-data \"/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs\""
|
|
401
|
+if [ ! "$app_repo" ]; then
|
|
402
|
+ echo "echo -n ''"
|
409
|
403
|
else
|
410
|
|
- echo " set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
|
411
|
|
- echo " chown -R ${app_name}:${app_name} \"${app_dir}\""
|
412
|
|
-fi
|
413
|
|
-if [ $app_daemon ]; then
|
414
|
|
- echo " systemctl restart ${app_name}"
|
|
404
|
+ echo " CURR_${app_name_upper}_COMMIT=\$(get_completion_param \"${app_name} commit\")"
|
|
405
|
+ echo " if [[ \"\$CURR_${app_name_upper}_COMMIT\" == \"\$${app_name_upper}_COMMIT\" ]]; then"
|
|
406
|
+ echo ' return'
|
|
407
|
+ echo ' fi'
|
|
408
|
+ if [ $app_webui ]; then
|
|
409
|
+ echo ''
|
|
410
|
+ echo " if grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then"
|
|
411
|
+ echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")"
|
|
412
|
+ echo ' fi'
|
|
413
|
+ fi
|
|
414
|
+ echo ''
|
|
415
|
+ echo ' # update to the next commit'
|
|
416
|
+ if [ ! "$app_dir" ]; then
|
|
417
|
+ echo " set_repo_commit \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
|
|
418
|
+ echo " chown -R www-data:www-data \"/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs\""
|
|
419
|
+ else
|
|
420
|
+ echo " set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
|
|
421
|
+ echo " chown -R ${app_name}:${app_name} \"${app_dir}\""
|
|
422
|
+ fi
|
|
423
|
+ if [ $app_daemon ]; then
|
|
424
|
+ echo " systemctl restart ${app_name}"
|
|
425
|
+ fi
|
415
|
426
|
fi
|
416
|
427
|
echo '}'
|
417
|
428
|
echo ''
|
|
@@ -775,42 +786,51 @@ if [ $app_webui ]; then
|
775
|
786
|
echo ' fi'
|
776
|
787
|
fi
|
777
|
788
|
|
778
|
|
-echo " if [ -d /repos/${app_name} ]; then"
|
779
|
|
-if [ $app_webui ]; then
|
780
|
|
- echo " mkdir \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
781
|
|
-fi
|
782
|
|
-if [ ! "$app_dir" ]; then
|
783
|
|
- echo " cp -r -p /repos/${app_name}/. \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
784
|
|
- echo " cd \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" || exit 324687356"
|
785
|
|
-else
|
786
|
|
- echo " cp -r -p /repos/${app_name}/. \"${app_dir}\""
|
787
|
|
- echo " cd \"${app_dir}\" || exit 36487365"
|
788
|
|
-fi
|
789
|
|
-echo ' git pull'
|
790
|
|
-echo ' else'
|
791
|
|
-if [ ! "$app_dir" ]; then
|
792
|
|
- echo " git_clone \"\$${app_name_upper}_REPO\" \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
793
|
|
-else
|
794
|
|
- echo " git_clone \"\$${app_name_upper}_REPO\" \"${app_dir}\""
|
795
|
|
-fi
|
796
|
|
-echo ' fi'
|
797
|
|
-echo ''
|
798
|
|
-if [ ! "$app_dir" ]; then
|
799
|
|
- echo " if [ ! -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" ]; then"
|
|
789
|
+if [ "$app_repo" ]; then
|
|
790
|
+ echo " if [ -d /repos/${app_name} ]; then"
|
|
791
|
+ if [ $app_webui ]; then
|
|
792
|
+ echo " mkdir \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
|
793
|
+ fi
|
|
794
|
+ if [ ! "$app_dir" ]; then
|
|
795
|
+ echo " cp -r -p /repos/${app_name}/. \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
|
796
|
+ echo " cd \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" || exit 324687356"
|
|
797
|
+ else
|
|
798
|
+ echo " cp -r -p /repos/${app_name}/. \"${app_dir}\""
|
|
799
|
+ echo " cd \"${app_dir}\" || exit 36487365"
|
|
800
|
+ fi
|
|
801
|
+ echo ' git pull'
|
|
802
|
+ echo ' else'
|
|
803
|
+ if [ ! "$app_dir" ]; then
|
|
804
|
+ echo " git_clone \"\$${app_name_upper}_REPO\" \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
|
805
|
+ else
|
|
806
|
+ echo " git_clone \"\$${app_name_upper}_REPO\" \"${app_dir}\""
|
|
807
|
+ fi
|
|
808
|
+ echo ' fi'
|
|
809
|
+ echo ''
|
|
810
|
+ if [ ! "$app_dir" ]; then
|
|
811
|
+ echo " if [ ! -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" ]; then"
|
|
812
|
+ else
|
|
813
|
+ echo " if [ ! -d \"${app_dir}\" ]; then"
|
|
814
|
+ fi
|
|
815
|
+ echo " echo \$'Unable to clone ${app_name} repo'"
|
|
816
|
+ echo ' exit 87525'
|
|
817
|
+ echo ' fi'
|
|
818
|
+ echo ''
|
800
|
819
|
else
|
801
|
|
- echo " if [ ! -d \"${app_dir}\" ]; then"
|
|
820
|
+ echo " mkdir -p \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
|
821
|
+ if [ "$app_dir" ]; then
|
|
822
|
+ echo " mkdir \"${app_dir}\""
|
|
823
|
+ fi
|
802
|
824
|
fi
|
803
|
|
-echo " echo \$'Unable to clone ${app_name} repo'"
|
804
|
|
-echo ' exit 87525'
|
805
|
|
-echo ' fi'
|
806
|
|
-echo ''
|
807
|
825
|
if [ ! "$app_dir" ]; then
|
808
|
826
|
echo " cd \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" || exit 36587356"
|
809
|
827
|
else
|
810
|
828
|
echo " cd \"${app_dir}\" || exit 3463754637"
|
811
|
829
|
fi
|
812
|
|
-echo " git checkout \"\$${app_name_upper}_COMMIT\" -b \"\$${app_name_upper}_COMMIT\""
|
813
|
|
-echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\""
|
|
830
|
+if [ "$app_repo" ]; then
|
|
831
|
+ echo " git checkout \"\$${app_name_upper}_COMMIT\" -b \"\$${app_name_upper}_COMMIT\""
|
|
832
|
+ echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\""
|
|
833
|
+fi
|
814
|
834
|
if [ $app_webui ]; then
|
815
|
835
|
echo ''
|
816
|
836
|
echo " chmod g+w \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
|
|
@@ -951,7 +971,7 @@ if [ $app_daemon ]; then
|
951
|
971
|
echo " echo 'Description=${app_name}';"
|
952
|
972
|
echo " echo 'After=syslog.target';"
|
953
|
973
|
echo " echo 'After=network.target';"
|
954
|
|
- echo " echo 'Documentation=${app_name_upper}_REPO";
|
|
974
|
+ echo " echo \"Documentation=\$${app_name_upper}_REPO\";";
|
955
|
975
|
echo " echo '';"
|
956
|
976
|
echo " echo '[Service]';"
|
957
|
977
|
echo " echo 'Type=simple';"
|