iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor improvements

Browse Source
This commit is contained in:
Ace
2019-04-18 13:42:33 +02:00
committed by GitHub
parent f6e8e31d61
commit c6e195c235
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
prototype.sh
View File

@@ -19,7 +19,7 @@ if [ -z "$option" ]; then
exit exit
fi fi
if [ "$option" = 3 ]; then if [ "$option" = 3 ]; then
echo -e "Removing the E-Paper software now..." echo -e "\e[1;36m"Removing the E-Paper software now..."\e[0m"
pip3 uninstall Pillow -y && sudo pip3 uninstall Pillow -y && sudo pip3 uninstall pyowm -y&& sudo pip3 uninstall ics -y && pip3 uninstall pyowm -y && pip3 uninstall ics -y && sudo apt-get remove supervisor -y && pip3 uninstall feedparser && sudo pip3 uninstall feedparser && sudo apt-get clean && sudo apt-get autoremove -y pip3 uninstall Pillow -y && sudo pip3 uninstall Pillow -y && sudo pip3 uninstall pyowm -y&& sudo pip3 uninstall ics -y && pip3 uninstall pyowm -y && pip3 uninstall ics -y && sudo apt-get remove supervisor -y && pip3 uninstall feedparser && sudo pip3 uninstall feedparser && sudo apt-get clean && sudo apt-get autoremove -y
if [ -e /etc/supervisor/conf.d/E-Paper.conf ]; then if [ -e /etc/supervisor/conf.d/E-Paper.conf ]; then
sudo rm /etc/supervisor/conf.d/E-Paper.conf sudo rm /etc/supervisor/conf.d/E-Paper.conf
@@ -32,7 +32,7 @@ if [ "$option" = 3 ]; then
fi fi
if [ "$option" = 1 ]; then if [ "$option" = 1 ]; then
echo "Checking if the settings.py exists..." echo -e "\e[1;36m"Checking if the settings.py exists..."\e[0m"
if [ -e /home/pi/Inky-Calendar/Calendar/settings.py ]; then if [ -e /home/pi/Inky-Calendar/Calendar/settings.py ]; then
echo -e "Found an E-Paper settings file." echo -e "Found an E-Paper settings file."
sleep 2 sleep 2
@@ -47,8 +47,9 @@ if [ "$option" = 1 ]; then
cd cd
else else
# Ask to update anyway. May not work always, but can help with new versions. # Ask to update anyway. May not work always, but can help with new versions.
echo -e "\e[1mCould not find the configuration file -settings.py- in /home/pi/Inky-Calendar/Calendar" echo -e "\e[1;36m"Could not find the configuration file -settings.py- in /home/pi/Inky-Calendar/Calendar"\e[0m"
echo -e "\e[1mWould you like to update the Inky-Calendar software anyway?" sleep 2
echo -e "\e[1;36m"Would you like to update the Inky-Calendar software anyway?"\e[0m"
echo -e "\e[97mPlease type [y] for yes or [n] for no and confirm your selection with [ENTER]" 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_anyway read -r -p 'Waiting for input... ' update_anyway
@@ -86,9 +87,12 @@ fi
if [ "$option" = 1 ] || [ "$option" = 2 ]; then if [ "$option" = 1 ] || [ "$option" = 2 ]; then
# Ask to update system # Ask to update system
echo -e "\e[1mWould you like to update and upgrade the operating system first?" echo -e "\e[1;36m"Would you like to update and upgrade the operating system first?"\e[0m"
sleep 1
echo -e "\e[97mIt is not scrictly required, but highly recommended." echo -e "\e[97mIt is not scrictly required, but highly recommended."
sleep 1
echo -e "\e[97mPlease note that updating may take quite some time, in rare cases up to 1 hour." echo -e "\e[97mPlease note that updating may take quite some time, in rare cases up to 1 hour."
sleep 1
echo -e "\e[97mPlease type [y] for yes or [n] for no and confirm your selection with [ENTER]" 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 read -r -p 'Waiting for input... ' update
@@ -104,6 +108,7 @@ if [ "$option" = 1 ] || [ "$option" = 2 ]; then
if [ "$update" = Y ] || [ "$update" = y ]; then if [ "$update" = Y ] || [ "$update" = y ]; then
# Updating and upgrading the system, without taking too much space # Updating and upgrading the system, without taking too much space
echo -e "\e[1;36m"Running apt-get update and apt-get dist-upgrade for you..."\e[0m" 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" 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
echo -e "\e[1;36m"System successfully updated and upgraded!"\e[0m" echo -e "\e[1;36m"System successfully updated and upgraded!"\e[0m"