diff --git a/rootfs/standard/usr/share/mynode_apps/wetty/scripts/install_wetty.sh b/rootfs/standard/usr/share/mynode_apps/wetty/scripts/install_wetty.sh index aba12962..574d0e3a 100644 --- a/rootfs/standard/usr/share/mynode_apps/wetty/scripts/install_wetty.sh +++ b/rootfs/standard/usr/share/mynode_apps/wetty/scripts/install_wetty.sh @@ -12,6 +12,8 @@ echo "==================== INSTALLING APP ====================" # has already been downloaded and extracted. Any additional env variables specified # in the JSON file are also present. -# TODO: Perform installation steps here +yarn +yarn build +# yarn global add wetty@$VERSION echo "================== DONE INSTALLING APP =================" \ No newline at end of file diff --git a/rootfs/standard/usr/share/mynode_apps/wetty/wetty.json b/rootfs/standard/usr/share/mynode_apps/wetty/wetty.json index 3808704b..37a1c9c8 100644 --- a/rootfs/standard/usr/share/mynode_apps/wetty/wetty.json +++ b/rootfs/standard/usr/share/mynode_apps/wetty/wetty.json @@ -1,6 +1,5 @@ { "name": "WeTTY", - "comment": "HIDDEN - CHANGE show_on_application_page show_on_homepage ", "short_name": "wetty", "author": { "name": "Cian Butler", @@ -13,9 +12,10 @@ "category": "device_management", "short_description": "Linux Terminal", "description": [ - "Terminal over HTTP and https. WeTTY is an alternative to ajaxterm and anyterm but much better than them because WeTTY uses xterm.js which is a full fledged implementation of terminal emulation written entirely in JavaScript. WeTTY uses websockets rather than Ajax and hence better response time." + "Terminal over HTTP and HTTPS. WeTTY is an alternative to ajaxterm and anyterm but much better than them because WeTTY uses xterm.js which is a full fledged implementation of terminal emulation written entirely in JavaScript. WeTTY uses websockets rather than Ajax and hence better response time." ], - "latest_version": "v2.3.0", + "linux_user": "wetty", + "latest_version": "v2.4.2", "targz_download_url": "https://github.com/butlerx/wetty/archive/refs/tags/{VERSION}.tar.gz", "install_env_vars": {}, "supports_app_page": true, @@ -26,8 +26,8 @@ "requires_docker_image_installation": false, "requires_electrs": false, "requires_lightning": false, - "show_on_application_page": false, - "show_on_homepage": false, + "show_on_application_page": true, + "show_on_homepage": true, "show_on_status_page": true, "hide_status_icon": false, "app_tile_name": "WeTTY", @@ -39,10 +39,8 @@ { "heading": "Instructions", "content": [ - "Add general usage instructions here. You can open the app with the Open button on the left (if web based).", - "For more custom content, update the template and python files under the 'www' folder.", - "Paragraph 3", - "Paragraph 4", + "WeTTY is a web-based terminal application for your node. To use, simple click Open on the left and login!", + "The typical login credentials are 'admin' and your myNode password. Once successfully logged in, you will be presented with a Linux terminal and will be able to enter terminal commands.", "Enjoy!" ] } @@ -52,6 +50,7 @@ "can_enable_disable": true, "is_beta": false, "is_premium": false, + "homepage_section": "apps", "homepage_order": 92, "app_type": "custom", "sdk_version": 1 diff --git a/rootfs/standard/usr/share/mynode_apps/wetty/wetty.service b/rootfs/standard/usr/share/mynode_apps/wetty/wetty.service index 1b771c6e..a51c6775 100644 --- a/rootfs/standard/usr/share/mynode_apps/wetty/wetty.service +++ b/rootfs/standard/usr/share/mynode_apps/wetty/wetty.service @@ -3,15 +3,15 @@ [Unit] Description=wetty -Wants=www.service docker_images.service -After=www.service docker_images.service +Wants=www.service +After=www.service [Service] WorkingDirectory=/opt/mynode/wetty ExecStartPre=/usr/bin/is_not_shutting_down.sh ExecStartPre=/bin/bash -c 'if [ -f /usr/bin/service_scripts/pre_wetty.sh ]; then /bin/bash /usr/bin/service_scripts/pre_wetty.sh; fi' -ExecStart=FILL_IN_EXECSTART +ExecStart=/usr/bin/yarn run start -p 2224 --host 0.0.0.0 -b / ExecStartPost=/bin/bash -c 'if [ -f /usr/bin/service_scripts/post_wetty.sh ]; then /bin/bash /usr/bin/service_scripts/post_wetty.sh; fi' #ExecStop=TODO