Browse Source

Remove node apps after stopping daemon

Bob Mottram 7 years ago
parent
commit
3942cd7c4d
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      src/freedombone-template

+ 8
- 8
src/freedombone-template View File

@@ -579,14 +579,6 @@ echo '    fi'
579 579
 echo '}'
580 580
 echo ''
581 581
 echo "function remove_${app_name} {"
582
-if [ "$app_nodeapp" ]; then
583
-    echo "    npm uninstall -g ${app_nodeapp}"
584
-    echo ''
585
-fi
586
-if [[ "$app_node" == 'yes' ]]; then
587
-    echo "    remove_nodejs ${app_name}"
588
-    echo ''
589
-fi
590 582
 echo "    nginx_dissite \"\$${app_name_upper}_DOMAIN_NAME\""
591 583
 echo "    remove_certs \"\$${app_name_upper}_DOMAIN_NAME\""
592 584
 echo ''
@@ -598,6 +590,14 @@ if [ $app_daemon ]; then
598 590
     echo '    fi'
599 591
     echo "    userdel -r ${app_name}"
600 592
 fi
593
+if [ "$app_nodeapp" ]; then
594
+    echo "    npm uninstall -g ${app_nodeapp}"
595
+    echo ''
596
+fi
597
+if [[ "$app_node" == 'yes' ]]; then
598
+    echo "    remove_nodejs ${app_name}"
599
+    echo ''
600
+fi
601 601
 if [ $app_webui ]; then
602 602
     echo ''
603 603
     echo "    if [ -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME\" ]; then"