diff --git a/plugins.sh b/plugins.sh index 6465661..ab8b8d7 100755 --- a/plugins.sh +++ b/plugins.sh @@ -26,12 +26,13 @@ plugin_menu() { install_plugin $plugin $plugin_path fi done + break return fi #install single plugin #get plugin path plugin_path=$(cat $SCRIPTDIR/plugins_list | sed -n -e "s/^plugin:$plugin path:\([[:graph:]]*\)/\1/p") - install_plugin $plugin $plugin_path + install_plugin plugin_menu #keep going until quit done @@ -40,7 +41,7 @@ plugin_menu() { plugin_menu_cloud() { echo - echo "You can setup cloud-based plugins at this time. Most will have to be configured" + echo "You can setup cloud-based plugins at this time. Some will have to be configured" echo "in your template instance before making new instances." echo PS3='Select cloud-based plugins to install: ' @@ -49,10 +50,11 @@ plugin_menu_cloud() { select plugin in "${plugins[@]}" do if [ "$plugin" == Quit ]; then + break return fi plugin_path=$(cat $SCRIPTDIR/plugins_list | sed -n -e "s/^plugin:$plugin path:\([[:graph:]]*\)/\1/p") - install_plugin $plugin $plugin_path + install_plugin plugin_menu_cloud #keep going until quit done } diff --git a/plugins_cloud b/plugins_cloud index ecf06ed..1624d94 100644 --- a/plugins_cloud +++ b/plugins_cloud @@ -1,4 +1,4 @@ -plugin:SimplyPrint Cloud path:https://github.com/SimplyPrint/OctoPrint-SimplyPrint/archive/master.zip +plugin:SimplyPrint path:https://github.com/SimplyPrint/OctoPrint-SimplyPrint/archive/master.zip plugin:OctoEverywhere path:https://github.com/QuinnDamerell/OctoPrint-OctoEverywhere/archive/master.zip -plugin:Polar Cloud path:https://github.com/markwal/OctoPrint-PolarCloud/archive/master.zip -plugin:AstroPrint Cloud path:https://github.com/AstroPrint/OctoPrint-AstroPrint/archive/master.zip \ No newline at end of file +plugin:Polar path:https://github.com/markwal/OctoPrint-PolarCloud/archive/master.zip +plugin:AstroPrint path:https://github.com/AstroPrint/OctoPrint-AstroPrint/archive/master.zip \ No newline at end of file