From d2683a6628cc2e8bda6e4164bd4f35e4e6e8010e Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 00:44:27 +0100 Subject: [PATCH 01/17] Please don't use this yet This is the first commit for release v1.7. It was adjusted to work on the new release (v1.7). The code has been cleaned up and runs faster now. It's also possible to run the software even with a different username than 'pi'. Supervisor handles launching at boot more efficiently and gives up running the main file if the software won't run for at least 30 seconds. --- Installer.sh | 138 ++++++++++++++++----------------------------------- 1 file changed, 44 insertions(+), 94 deletions(-) diff --git a/Installer.sh b/Installer.sh index 83486f5..ecfd1bf 100644 --- a/Installer.sh +++ b/Installer.sh @@ -10,81 +10,49 @@ echo -e "\e[97mConfirm your selection with [ENTER]" read -r -p 'Waiting for input... ' option # Invalid number selected, abort -if [ "$option" != 1 ] && [ "$option" != 2 ] && [ "$option" != 3 ]; then - echo -e "invalid number, aborting now" - exit +if [ "$option" != 1 ] && [ "$option" != 2 ] && [ "$option" != 3 ]; then echo -e "invalid number, aborting now" exit fi # No option selected, abort -if [ -z "$option" ]; then - echo -e "You didn't enter anything, aborting now." - exit +if [ -z "$option" ]; then echo -e "You didn't enter anything, aborting now." exit fi # What to do when uninstalling software if [ "$option" = 3 ]; then - echo -e "\e[1;36m"Removing the E-Paper software now..."\e[0m" - pip3 uninstall Pillow -y pyowm -y ics -y feedparser -y && sudo apt-get remove supervisor -y && sudo apt-get clean && sudo apt-get autoremove -y - if [ -e /etc/supervisor/conf.d/Inky-Calendar.conf ]; then - sudo rm /etc/supervisor/conf.d/Inky-Calendar.conf + + # Remove requirements of software + echo -e "\e[1;36m"Removing requirements for Inky-Calendar software"\e[0m" + cd /home/$USER/Inky-Calendar && pip3 uninstall -r requirements.txt && sudo apt-get clean && sudo apt-get autoremove -y + + # Remove configuration file for supervisor if it exists + if [ -e /etc/supervisor/conf.d/Inky-Calendar.conf ]; then sudo rm /etc/supervisor/conf.d/Inky-Calendar.conf fi + + # Print message that libraries have been uninstalled now echo -e "\e[1;36m"The libraries have been removed successfully"\e[0m" - sleep 1 + sleep 2 + + # Remove the Inky-Calendar directory if it exists echo -e "Removing the Inky-Calendar folder if it exists" - if [ -d "/home/pi/Inky-Calendar" ]; then - sudo rm -r /home/pi/Inky-Calendar/ + if [ -d "/home/$USER/Inky-Calendar" ]; then + sudo rm -r /home/$USER/Inky-Calendar/ echo -e "\e[1;36m"Found Inky-Calendar folder and deleted it"\e[0m" fi echo -e "\e[1;36m"All done!"\e[0m" fi -if [ "$option" = 1 ]; then #UPDATE software +if [ "$option" = 1 ]; then # UPDATE software echo -e "\e[1;36m"Checking if the Inky-Calendar folder exists..."\e[0m" - if [ -d "/home/pi/Inky-Calendar" ]; then - echo -e "Found Inky-Calendar directory in /home/pi" + if [ -d "/home/$USER/Inky-Calendar" ]; then + echo -e "Found Inky-Calendar directory in /home/$USER" sleep 2 echo -e "To prevent overwriting the Inky-Calendar folder, the installer will not continue." echo -e "Please rename the Inky-Calendar folder and then re-run the installer" exit - else - echo -e "\e[1;36m"No folder named 'Inky-Calendar' found. Continuing"\e[0m" - echo -e "\e[97mPlease type [y] to force-update or [n] to abort c and confirm your selection with [ENTER]" - read -r -p 'Waiting for input... ' update_anyway - - if [ "$update_anyway" != Y ] && [ "$update_anyway" != y ] && [ "$update_anyway" != N ] && [ "$update_anyway" != n ]; then - echo -e "invalid input, aborting now" - exit - fi - if [ -z "$update_anyway" ]; then - echo -e "You didn't enter anything, aborting now." - exit - fi - - if [ "$update_anyway" = Y ] || [ "$update_anyway" = y ]; then - echo "Updating now..." - else - echo -e "Not attempting to update, exiting now." - exit - fi fi fi -if [ "$option" = 2 ]; then # Install software - echo -e "\e[1;36m"Setting up the system by installing some required libraries for python3"\e[0m" - - # Installing a few packages which are missing on Raspbian Stretch Lite - echo -e "\e[1;36m"Installing a few packages that are missing on Raspbian Stretch Lite..."\e[0m" - sudo apt-get install python3-pip -y - sudo apt-get install python-rpi.gpio-dbgsym -y python3-rpi.gpio -y python-rpi.gpio -y python3-rpi.gpio-dbgsym -y python3-spidev -y git -y libopenjp2-7-dev -y libtiff5 -y python3-numpy -y - echo "" - - # Running apt-get clean and apt-get autoremove - echo -e "\e[1;36m"Cleaning a bit of mess to free up some space..."\e[0m" - sudo apt-get clean && sudo apt-get autoremove -y - echo "" -fi - -if [ "$option" = 1 ] || [ "$option" = 2 ]; then +if [ "$option" = 1 ] || [ "$option" = 2 ]; then # This happens when installing or updating # Ask to update system echo -e "\e[1;36m"Would you like to update and upgrade the operating system first?"\e[0m" sleep 1 @@ -95,13 +63,10 @@ if [ "$option" = 1 ] || [ "$option" = 2 ]; then echo -e "\e[97mPlease type [y] for yes or [n] for no and confirm your selection with [ENTER]" read -r -p 'Waiting for input... ' update - if [ "$update" != Y ] && [ "$update" != y ] && [ "$update" != N ] && [ "$update" != n ]; then - echo -e "invalid input, aborting now" - exit + if [ "$update" != Y ] && [ "$update" != y ] && [ "$update" != N ] && [ "$update" != n ]; then echo -e "invalid input, aborting now" exit fi - if [ -z "$update" ]; then - echo -e "You didn't enter anything, aborting now." - exit + + if [ -z "$update" ]; then echo -e "You didn't enter anything, aborting now." exit fi if [ "$update" = Y ] || [ "$update" = y ]; then @@ -109,46 +74,30 @@ if [ "$option" = 1 ] || [ "$option" = 2 ]; then echo -e "\e[1;36m"Running apt-get update and apt-get dist-upgrade for you..."\e[0m" sleep 1 echo -e "\e[1;36m"This will take a while, sometimes up to 1 hour"\e[0m" - sudo apt-get update && sudo apt-get dist-upgrade -y + sudo apt-get update && sudo apt-get dist-upgrade -y && sudo apt-get clean echo -e "\e[1;36m"System successfully updated and upgraded!"\e[0m" echo "" fi + # Cloning Inky-Calendar repo + echo -e "\e[1;36m"Cloning Inky-Calendar repo from Github"\e[0m" + cd /home/$USER && git clone -b dev https://github.com/aceisace/Inky-Calendar + # Installing dependencies - - #PYOWM (v2.10.0) for user pi - echo -e "\e[1;36m"Installing dependencies for the Inky-Calendar software"\e[0m" - - pip3 install pyowm==2.10.0 Pillow==5.3.0 ics==0.4 feedparser==5.2.1 pytz==2019.3 + echo -e "\e[1;36m"Installing requirements for Inky-Calendar software"\e[0m" + cd /home/$USER/Inky-Calendar && pip3 install -r requirements.txt - echo -e "\e[1;36m"Finished installing all dependencies"\e[0m" - - # Clone the repository, then delete some non-required files - echo -e "\e[1;36m"Installing the Inky-Calendar Software for your display"\e[0m" - cd - git clone https://github.com/aceisace/Inky-Calendar Inky-Calendar-temp - mkdir Inky-Calendar - cd Inky-Calendar-temp - cp -r Calendar /home/pi/Inky-Calendar/ - cp README.md /home/pi/Inky-Calendar/ - cp LICENSE /home/pi/Inky-Calendar/ - cp -r .git /home/pi/Inky-Calendar/ - - # Make a copy of the sample settings.py file - cd /home/pi/Inky-Calendar/Calendar - cp settings.py.sample settings.py - - # Remove the downloaded (temporary) directory - cd - sudo rm -r Inky-Calendar-temp + # Create symlinks of settings and configuration file + ln -s /home/$USER/Inky-Calendar/settings/settings.py /home/$USER/Inky-Calendar/modules/ + ln -s /home/$USER/Inky-Calendar/settings/configuration.py /home/$USER/Inky-Calendar/modules/ # add a short info cat > /home/pi/Inky-Calendar/Info.txt << EOF This document contains a short info of the Inky-Calendar software version Version: 1.7 -Installer version: 1.7 (Early December 2019) -configuration file: /home/pi/Inky-Calendar/settings/settings.py +Installer version: 1.7 (Mid December 2019) +settings file: /home/pi/Inky-Calendar/settings/settings.py If the time was set correctly, you installed this software on: EOF echo "$(date)" >> /home/pi/Inky-Calendar/Info.txt @@ -158,18 +107,19 @@ EOF echo -e "\e[1;36m"Setting up auto-start of script at boot"\e[0m" sudo apt-get install supervisor -y - sudo bash -c 'cat > /etc/supervisor/conf.d/E-Paper.conf' << EOF + sudo bash -c 'cat > /etc/supervisor/conf.d/inkycal.conf' << EOF [program:Inky-Calendar] -command = /usr/bin/python3 /home/pi/Inky-Calendar/modules/inkycal.py - -stdout_logfile = /home/pi/Inky-Calendar/logs/logfile.log +command = /usr/bin/python3 /home/$USER/Inky-Calendar/modules/inkycal.py +stdout_logfile = /home/$USER/Inky-Calendar/logs/logfile.log stdout_logfile_maxbytes = 5MB -stderr_logfile = /home/pi/Inky-Calendar/logs/errors.log +stderr_logfile = /home/$USER/Inky-Calendar/logs/errors.log stderr_logfile_maxbytes = 5MB -autorestart = true +user = $USER +startsecs = 30 EOF - sudo service supervisor start E-Paper + sudo service supervisor reload + sudo service supervisor start Inky-Calendar echo "" @@ -185,5 +135,5 @@ EOF echo -e "\e[1;36m"file to /home/pi/Inky-Calendar/settings/setting.py"\e[0m" echo -e "\e[1;36m"You can test if the programm works by typing:"\e[0m" - echo -e "\e[1;36m"python3 /home/pi/Inky-Calendar/Calendar/E-Paper.py"\e[0m" + echo -e "\e[1;36m"python3 /home/$USER/Inky-Calendar/Calendar/E-Paper.py"\e[0m" fi From d0471ab0306a85a13fca6e3ede2e4a836d36b669 Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 13:47:10 +0100 Subject: [PATCH 02/17] Please do not use this yet Adaptations, better installation procedure, option to launch web-ui after install and move the generated file to the correct lcoation. username support. Added option to choose if start at boot is desired or not. Testing in progress. Please do not use this yet. --- Installer.sh | 111 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 33 deletions(-) diff --git a/Installer.sh b/Installer.sh index ecfd1bf..ac3f388 100644 --- a/Installer.sh +++ b/Installer.sh @@ -3,9 +3,9 @@ # Version: 1.7 (Early Dec 2019) echo -e "\e[1mPlease select an option from below:" -echo -e "\e[97mEnter \e[91m1 \e[97m to update the E-Paper software" #Option 1 : UPDATE -echo -e "\e[97mEnter \e[91m2 \e[97m to install the E-Paper software" #Option 2 : INSTALL -echo -e "\e[97mEnter \e[91m3 \e[97m to uninstall the E-Paper software" #Option 3 : UNINSTALL +echo -e "\e[97mEnter \e[91m[1] \e[97m to update Inky-Calendar software" #Option 1 : UPDATE +echo -e "\e[97mEnter \e[91m[2] \e[97m to install Inky-Calendar software" #Option 2 : INSTALL +echo -e "\e[97mEnter \e[91m[3] \e[97m to uninstall Inky-Calendar software" #Option 3 : UNINSTALL echo -e "\e[97mConfirm your selection with [ENTER]" read -r -p 'Waiting for input... ' option @@ -22,12 +22,12 @@ if [ "$option" = 3 ]; then # Remove requirements of software echo -e "\e[1;36m"Removing requirements for Inky-Calendar software"\e[0m" - cd /home/$USER/Inky-Calendar && pip3 uninstall -r requirements.txt && sudo apt-get clean && sudo apt-get autoremove -y + cd /home/"$USER"/Inky-Calendar && pip3 uninstall -r requirements.txt && sudo apt-get clean && sudo apt-get autoremove -y # Remove configuration file for supervisor if it exists - if [ -e /etc/supervisor/conf.d/Inky-Calendar.conf ]; then sudo rm /etc/supervisor/conf.d/Inky-Calendar.conf + if [ -e /etc/supervisor/conf.d/inkycal.conf ]; then sudo rm /etc/supervisor/conf.d/inkycal.conf fi - + # Print message that libraries have been uninstalled now echo -e "\e[1;36m"The libraries have been removed successfully"\e[0m" sleep 2 @@ -35,7 +35,7 @@ if [ "$option" = 3 ]; then # Remove the Inky-Calendar directory if it exists echo -e "Removing the Inky-Calendar folder if it exists" if [ -d "/home/$USER/Inky-Calendar" ]; then - sudo rm -r /home/$USER/Inky-Calendar/ + sudo rm -r /home/"$USER"/Inky-Calendar/ echo -e "\e[1;36m"Found Inky-Calendar folder and deleted it"\e[0m" fi echo -e "\e[1;36m"All done!"\e[0m" @@ -81,15 +81,15 @@ if [ "$option" = 1 ] || [ "$option" = 2 ]; then # This happens when installing o # Cloning Inky-Calendar repo echo -e "\e[1;36m"Cloning Inky-Calendar repo from Github"\e[0m" - cd /home/$USER && git clone -b dev https://github.com/aceisace/Inky-Calendar + cd /home/"$USER" && git clone -b dev https://github.com/aceisace/Inky-Calendar # Installing dependencies echo -e "\e[1;36m"Installing requirements for Inky-Calendar software"\e[0m" - cd /home/$USER/Inky-Calendar && pip3 install -r requirements.txt + cd /home/"$USER"/Inky-Calendar && pip3 install -r requirements.txt # Create symlinks of settings and configuration file - ln -s /home/$USER/Inky-Calendar/settings/settings.py /home/$USER/Inky-Calendar/modules/ - ln -s /home/$USER/Inky-Calendar/settings/configuration.py /home/$USER/Inky-Calendar/modules/ + ln -s /home/"$USER"/Inky-Calendar/settings/settings.py /home/"$USER"/Inky-Calendar/modules/ + ln -s /home/"$USER"/Inky-Calendar/settings/configuration.py /home/"$USER"/Inky-Calendar/modules/ # add a short info cat > /home/pi/Inky-Calendar/Info.txt << EOF @@ -97,17 +97,26 @@ This document contains a short info of the Inky-Calendar software version Version: 1.7 Installer version: 1.7 (Mid December 2019) -settings file: /home/pi/Inky-Calendar/settings/settings.py +settings file: /home/$USER/Inky-Calendar/settings/settings.py If the time was set correctly, you installed this software on: +$(date) EOF - echo "$(date)" >> /home/pi/Inky-Calendar/Info.txt echo "" - # Setting up supervisor - echo -e "\e[1;36m"Setting up auto-start of script at boot"\e[0m" - sudo apt-get install supervisor -y + echo -e "\e[97mDo you want the software to start automatically at boot?" + echo -e "\e[97mPress [Y] for yes or [N] for no. The default option is yes" + echo -e "\e[97mConfirm your selection with [ENTER]" + read -r -p 'Waiting for input... ' autostart - sudo bash -c 'cat > /etc/supervisor/conf.d/inkycal.conf' << EOF + if [ "$autostart" != Y ] && [ "$autostart" != y ] && [ "$autostart" != N ] && [ "$autostart" != n ]; then echo -e "invalid input, aborting now" exit + fi + + if [ -z "$autostart" ] || [ "$autostart" = Y ] || [ "$autostart" = y ]; then + # Setting up supervisor + echo -e "\e[1;36m"Setting up auto-start of script at boot"\e[0m" + sudo apt-get install supervisor -y + + sudo bash -c 'cat > /etc/supervisor/conf.d/inkycal.conf' << EOF [program:Inky-Calendar] command = /usr/bin/python3 /home/$USER/Inky-Calendar/modules/inkycal.py stdout_logfile = /home/$USER/Inky-Calendar/logs/logfile.log @@ -118,22 +127,58 @@ user = $USER startsecs = 30 EOF - sudo service supervisor reload - sudo service supervisor start Inky-Calendar - - echo "" + sudo service supervisor reload && sudo service supervisor start Inky-Calendar + echo "" + fi # Final words - echo -e "\e[1;36m"The install was successful"\e[0m" - echo -e "\e[1;36m"The programm is set to start at every boot."\e[0m" - - echo -e "\e[1;31m"To enter your personal details, please use"\e[0m" - echo -e "\e[1;31m"the Settings-Web-UI.html web-page"\e[0m" - echo -e "\e[1;36m"To do so, open the file Settings-Web-UI.html from"\e[0m" - echo -e "\e[1;36m"/home/pi/Inky-Calendar/Settings-Web-UI.html with your browser,"\e[0m" - echo -e "\e[1;36m"add your details, click on generate and copy the settings.py"\e[0m" - echo -e "\e[1;36m"file to /home/pi/Inky-Calendar/settings/setting.py"\e[0m" - - echo -e "\e[1;36m"You can test if the programm works by typing:"\e[0m" - echo -e "\e[1;36m"python3 /home/$USER/Inky-Calendar/Calendar/E-Paper.py"\e[0m" + echo -e "\e[1;36m"The install was successful."\e[0m" + sleep 2 + echo -e "\e[1;31m"You can now add your personal details in the settings file"\e[0m" + echo -e "\e[1;31m"located in Inky-Calendar/settings/settings.py"\e[0m" + sleep 2 + + echo -e "\e[97mIf you want to add your details now, selet an option from below" + echo -e "\e[97mType [1] to open the settings-web-UI (user-fiendly)" + echo -e "\e[97mType [2] to open settings file with nano (can be run on SSH)" + echo -e "\e[97mType [3] to open settings file with python3 (can be run on SSH)" + echo -e "\e[97mLeave empty to skip this step" + echo -e "\e[97mConfirm your selection with [ENTER]" + read -r -p 'Waiting for input... ' settings + + # Invalid number selected, abort + if [ "$settings" != 1 ] && [ "$settings" != 2 ] && [ "$settings" != 3 ]; then echo -e "invalid number, skipping.." + fi + + # No option selected, abort + if [ -z "$settings" ]; then echo -e "You didn't enter anything, skipping.." + fi + + # What to do when uninstalling software + if [ "$settings" = 1 ]; then + echo -e "\e[1;36m"Opening web-UI for adding details..."\e[0m" + chromium-browser /home/"$USER"/Inky-Calendar/settings/settings-UI.html + sleep 2 + echo -e "\e[97mHave you added your details and clicked on 'Generate'?" + echo -e "\e[97mPress [Y] for yes." + read -r -p 'Waiting for input... ' complete + if [ -z "$complete" ] || [ "$complete" = Y ] || [ "$complete" = y ]; then + echo -e "\e[1;36m"Moving settings file to /home/"$USER"/Inky-Calendar/settings/"\e[0m" + if [ -e /etc/supervisor/conf.d/inkycal.conf ]; then mv /home/"$USER"/Downloads/settings.py /home/"$USER"/Inky-Calendar/settings/ + fi + fi + fi + + if [ "$settings" = 2 ]; then + echo -e "\e[1;36m"Opening settings file with nano"\e[0m" + nano /home/"$USER"/Inky-Calendar/settings/settings.py + fi + + if [ "$settings" = 3 ]; then + echo -e "\e[1;36m"Opening settings file with python3"\e[0m" + python3 /home/"$USER"/Inky-Calendar/settings/settings.py + fi + + echo -e "\e[1;36m"You can test if the programm works by running:"\e[0m" + echo -e "\e[1;36m"python3 /home/"$USER"/Inky-Calendar/Calendar/inkycal.py"\e[0m" fi From f71938d5ae13a0695c78c3bb00ef602aa5941941 Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 13:52:19 +0100 Subject: [PATCH 03/17] Update Installer.sh --- Installer.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer.sh b/Installer.sh index ac3f388..ba59c68 100644 --- a/Installer.sh +++ b/Installer.sh @@ -3,9 +3,9 @@ # Version: 1.7 (Early Dec 2019) echo -e "\e[1mPlease select an option from below:" -echo -e "\e[97mEnter \e[91m[1] \e[97m to update Inky-Calendar software" #Option 1 : UPDATE -echo -e "\e[97mEnter \e[91m[2] \e[97m to install Inky-Calendar software" #Option 2 : INSTALL -echo -e "\e[97mEnter \e[91m[3] \e[97m to uninstall Inky-Calendar software" #Option 3 : UNINSTALL +echo -e "\e[97mEnter \e[91m[1]\e[97m to update Inky-Calendar software" #Option 1 : UPDATE +echo -e "\e[97mEnter \e[91m[2]\e[97m to install Inky-Calendar software" #Option 2 : INSTALL +echo -e "\e[97mEnter \e[91m[3]\e[97m to uninstall Inky-Calendar software" #Option 3 : UNINSTALL echo -e "\e[97mConfirm your selection with [ENTER]" read -r -p 'Waiting for input... ' option From ce4ea69db085181571ba575965d5bcaee09ca5a0 Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 13:53:07 +0100 Subject: [PATCH 04/17] Update Installer.sh --- Installer.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer.sh b/Installer.sh index ba59c68..24260f4 100644 --- a/Installer.sh +++ b/Installer.sh @@ -3,9 +3,9 @@ # Version: 1.7 (Early Dec 2019) echo -e "\e[1mPlease select an option from below:" -echo -e "\e[97mEnter \e[91m[1]\e[97m to update Inky-Calendar software" #Option 1 : UPDATE -echo -e "\e[97mEnter \e[91m[2]\e[97m to install Inky-Calendar software" #Option 2 : INSTALL -echo -e "\e[97mEnter \e[91m[3]\e[97m to uninstall Inky-Calendar software" #Option 3 : UNINSTALL +echo -e "\e[97mEnter \e[91m[1]\e[97mto update Inky-Calendar software" #Option 1 : UPDATE +echo -e "\e[97mEnter \e[91m[2]\e[97mto install Inky-Calendar software" #Option 2 : INSTALL +echo -e "\e[97mEnter \e[91m[3]\e[97mto uninstall Inky-Calendar software" #Option 3 : UNINSTALL echo -e "\e[97mConfirm your selection with [ENTER]" read -r -p 'Waiting for input... ' option From 2a2c0a75c81e085e1dab76b6cd74413b0ef3ba3b Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 14:02:43 +0100 Subject: [PATCH 05/17] Update Installer.sh --- Installer.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer.sh b/Installer.sh index 24260f4..ba59c68 100644 --- a/Installer.sh +++ b/Installer.sh @@ -3,9 +3,9 @@ # Version: 1.7 (Early Dec 2019) echo -e "\e[1mPlease select an option from below:" -echo -e "\e[97mEnter \e[91m[1]\e[97mto update Inky-Calendar software" #Option 1 : UPDATE -echo -e "\e[97mEnter \e[91m[2]\e[97mto install Inky-Calendar software" #Option 2 : INSTALL -echo -e "\e[97mEnter \e[91m[3]\e[97mto uninstall Inky-Calendar software" #Option 3 : UNINSTALL +echo -e "\e[97mEnter \e[91m[1]\e[97m to update Inky-Calendar software" #Option 1 : UPDATE +echo -e "\e[97mEnter \e[91m[2]\e[97m to install Inky-Calendar software" #Option 2 : INSTALL +echo -e "\e[97mEnter \e[91m[3]\e[97m to uninstall Inky-Calendar software" #Option 3 : UNINSTALL echo -e "\e[97mConfirm your selection with [ENTER]" read -r -p 'Waiting for input... ' option From fff5adf6a61e4ddd0a797e320550b6b53fc2093b Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 14:29:19 +0100 Subject: [PATCH 06/17] Update Installer.sh --- Installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installer.sh b/Installer.sh index ba59c68..6a61ba1 100644 --- a/Installer.sh +++ b/Installer.sh @@ -156,9 +156,9 @@ EOF # What to do when uninstalling software if [ "$settings" = 1 ]; then - echo -e "\e[1;36m"Opening web-UI for adding details..."\e[0m" + echo -e "\e[1;36m"Add your details, click on generate, keep the file and close the browser"\e[0m" + sleep 5 chromium-browser /home/"$USER"/Inky-Calendar/settings/settings-UI.html - sleep 2 echo -e "\e[97mHave you added your details and clicked on 'Generate'?" echo -e "\e[97mPress [Y] for yes." read -r -p 'Waiting for input... ' complete From 6cadf8a39124eb99c523e55271f01504320fd8ae Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 17 Dec 2019 14:33:01 +0100 Subject: [PATCH 07/17] Updated template --- settings/settings-UI.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/settings-UI.html b/settings/settings-UI.html index 8b7cfae..5e3d659 100644 --- a/settings/settings-UI.html +++ b/settings/settings-UI.html @@ -305,7 +305,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI