h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Evgenii
2021-09-11 01:20:07 +03:00
parent 464cdc4f69
commit 617852de65
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/backup.sh
View File

@@ -182,11 +182,11 @@ backup_klipperscreen(){
backup_klipperscreen(){ backup_klipperscreen(){
if [ -d $MOONRAKERTELEGRAMBOT_DIR ] ; then if [ -d $MOONRAKERTELEGRAMBOT_DIR ] ; then
status_msg "Creating moonraker-telegram-bot backup ..." status_msg "Creating MoonrakerTelegramBot backup ..."
check_for_backup_dir check_for_backup_dir
get_date get_date
status_msg "Timestamp: $current_date" status_msg "Timestamp: $current_date"
mkdir -p $BACKUP_DIR/moonraker-telegram-bot-backups/"$current_date" mkdir -p $BACKUP_DIR/MoonrakerTelegramBot-backups/"$current_date"
cp -r $MOONRAKERTELEGRAMBOT_DIR $_ cp -r $MOONRAKERTELEGRAMBOT_DIR $_
ok_msg "Backup complete!" ok_msg "Backup complete!"
else else

18
scripts/functions.sh
View File

@@ -270,19 +270,19 @@ restart_klipperscreen(){
sudo systemctl restart KlipperScreen && ok_msg "KlipperScreen Service restarted!" sudo systemctl restart KlipperScreen && ok_msg "KlipperScreen Service restarted!"
} }
start_moonraker-telegram-bot(){ start_MoonrakerTelegramBot(){
status_msg "Starting moonraker-telegram-bot Service ..." status_msg "Starting MoonrakerTelegramBot Service ..."
sudo systemctl start moonraker-telegram-bot && ok_msg "moonraker-telegram-bot Service started!" sudo systemctl start MoonrakerTelegramBot && ok_msg "MoonrakerTelegramBot Service started!"
} }
stop_moonraker-telegram-bot(){ stop_MoonrakerTelegramBot(){
status_msg "Stopping moonraker-telegram-bot Service ..." status_msg "Stopping MoonrakerTelegramBot Service ..."
sudo systemctl stop moonraker-telegram-bot && ok_msg "moonraker-telegram-bot Service stopped!" sudo systemctl stop MoonrakerTelegramBot && ok_msg "MoonrakerTelegramBot Service stopped!"
} }
restart_moonraker-telegram-bot(){ restart_MoonrakerTelegramBot(){
status_msg "Restarting moonraker-telegram-bot Service ..." status_msg "Restarting MoonrakerTelegramBot Service ..."
sudo systemctl restart moonraker-telegram-bot && ok_msg "moonraker-telegram-bot Service restarted!" sudo systemctl restart MoonrakerTelegramBot && ok_msg "MoonrakerTelegramBot Service restarted!"
} }
restart_nginx(){ restart_nginx(){

32
scripts/install_moonraker-telegram-bot.sh
View File

@@ -1,17 +1,17 @@
install_moonraker-telegram-bot(){ install_MoonrakerTelegramBot(){
source_kiauh_ini source_kiauh_ini
system_check_moonraker-telegram-bot system_check_MoonrakerTelegramBot
#ask user for customization #ask user for customization
get_user_selections_moonraker-telegram-bot get_user_selections_MoonrakerTelegramBot
#moonraker-telegram-bot main installation #MoonrakerTelegramBot main installation
moonraker-telegram-bot_setup MoonrakerTelegramBot_setup
#execute customizations #execute customizations
symlinks_moonraker-telegram-bot symlinks_MoonrakerTelegramBot
#after install actions #after install actions
restart_moonraker-telegram-bot restart_MoonrakerTelegramBot
} }
system_check_moonraker-telegram-bot(){ system_check_MoonrakerTelegramBot(){
source_kiauh_ini source_kiauh_ini
if [ ! -e $klipper_cfg_loc/telegram.log ]; then if [ ! -e $klipper_cfg_loc/telegram.log ]; then
MOONRAKERTELEGRAMBOT_SL_FOUND="false" MOONRAKERTELEGRAMBOT_SL_FOUND="false"
@@ -20,7 +20,7 @@ system_check_moonraker-telegram-bot(){
fi fi
} }
get_user_selections_moonraker-telegram-bot(){ get_user_selections_MoonrakerTelegramBot(){
#user selection for telegram.log symlink #user selection for telegram.log symlink
if [ "$KMOONRAKERTELEGRAMBOT_SL_FOUND" = "false" ]; then if [ "$KMOONRAKERTELEGRAMBOT_SL_FOUND" = "false" ]; then
while true; do while true; do
@@ -43,21 +43,21 @@ get_user_selections_moonraker-telegram-bot(){
fi fi
} }
moonraker-telegram-bot_setup(){ MoonrakerTelegramBot_setup(){
dep=(wget curl unzip dfu-util) dep=(wget curl unzip dfu-util)
dependency_check dependency_check
status_msg "Downloading moonraker-telegram-bot ..." status_msg "Downloading MoonrakerTelegramBot ..."
#force remove existing moonraker-telegram-bot dir #force remove existing MoonrakerTelegramBot dir
[ -d $MOONRAKERTELEGRAMBOT_DIR ] && rm -rf $MOONRAKERTELEGRAMBOT_DIR [ -d $MOONRAKERTELEGRAMBOT_DIR ] && rm -rf $MOONRAKERTELEGRAMBOT_DIR
#clone into fresh moonraker-telegram-bot dir #clone into fresh MoonrakerTelegramBot dir
cd ${HOME} && git clone $MOONRAKERTELEGRAMBOT_REPO cd ${HOME} && git clone $MOONRAKERTELEGRAMBOT_REPO
ok_msg "Download complete!" ok_msg "Download complete!"
status_msg "Installing moonraker-telegram-bot ..." status_msg "Installing MoonrakerTelegramBot ..."
$MOONRAKERTELEGRAMBOT_DIR/install.sh $MOONRAKERTELEGRAMBOT_DIR/install.sh
echo; ok_msg "moonraker-telegram-bot successfully installed!" echo; ok_msg "MoonrakerTelegramBot successfully installed!"
} }
symlinks_moonraker-telegram-bot(){ symlinks_MoonrakerTelegramBot(){
#create a telegram.log symlink in klipper_config-dir #create a telegram.log symlink in klipper_config-dir
if [ "$SEL_MTBLOG_SL" = "true" ] && [ ! -e $klipper_cfg_loc/telegram.log ]; then if [ "$SEL_MTBLOG_SL" = "true" ] && [ ! -e $klipper_cfg_loc/telegram.log ]; then
status_msg "Creating telegram.log symlink ..." status_msg "Creating telegram.log symlink ..."

32
scripts/remove.sh
View File

@@ -387,47 +387,47 @@ remove_klipperscreen(){
CONFIRM_MSG="KlipperScreen successfully removed!" CONFIRM_MSG="KlipperScreen successfully removed!"
} }
remove_moonraker-telegram-bot(){ remove_MoonrakerTelegramBot(){
source_kiauh_ini source_kiauh_ini
### remove moonraker-telegram-bot dir ### remove MoonrakerTelegramBot dir
if [ -d $MOONRAKERTELEGRAMBOT_DIR ]; then if [ -d $MOONRAKERTELEGRAMBOT_DIR ]; then
status_msg "Removing moonraker-telegram-bot directory ..." status_msg "Removing MoonrakerTelegramBot directory ..."
rm -rf $MOONRAKERTELEGRAMBOT_DIR && ok_msg "Directory removed!" rm -rf $MOONRAKERTELEGRAMBOT_DIR && ok_msg "Directory removed!"
fi fi
### remove moonraker-telegram-bot VENV dir ### remove MoonrakerTelegramBot VENV dir
if [ -d $MOONRAKERTELEGRAMBOT_ENV_DIR ]; then if [ -d $MOONRAKERTELEGRAMBOT_ENV_DIR ]; then
status_msg "Removing moonraker-telegram-bot VENV directory ..." status_msg "Removing MoonrakerTelegramBot VENV directory ..."
rm -rf $MOONRAKERTELEGRAMBOT_ENV_DIR && ok_msg "Directory removed!" rm -rf $MOONRAKERTELEGRAMBOT_ENV_DIR && ok_msg "Directory removed!"
fi fi
### remove moonraker-telegram-bot service ### remove MoonrakerTelegramBot service
if [ -e /etc/systemd/system/moonraker-telegram-bot.service ]; then if [ -e /etc/systemd/system/MoonrakerTelegramBot.service ]; then
status_msg "Removing moonraker-telegram-bot service ..." status_msg "Removing MoonrakerTelegramBot service ..."
sudo systemctl stop moonraker-telegram-bot sudo systemctl stop MoonrakerTelegramBot
sudo systemctl disable moonraker sudo systemctl disable moonraker
sudo rm -f $SYSTEMDDIR/moonraker-telegram-bot.service sudo rm -f $SYSTEMDDIR/MoonrakerTelegramBot.service
###reloading units ###reloading units
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl reset-failed sudo systemctl reset-failed
ok_msg "moonraker-telegram-bot Service removed!" ok_msg "MoonrakerTelegramBot Service removed!"
fi fi
### remove moonraker-telegram-bot log ### remove MoonrakerTelegramBot log
if [ -e /tmp/telegram.log ]; then if [ -e /tmp/telegram.log ]; then
status_msg "Removing moonraker-telegram-bot log file ..." status_msg "Removing MoonrakerTelegramBot log file ..."
rm -f /tmp/telegram.log && ok_msg "File removed!" rm -f /tmp/telegram.log && ok_msg "File removed!"
fi fi
### remove moonraker-telegram-bot log symlink in config dir ### remove MoonrakerTelegramBot log symlink in config dir
if [ -e $klipper_cfg_loc/telegram.log ]; then if [ -e $klipper_cfg_loc/telegram.log ]; then
status_msg "Removing moonraker-telegram-bot log symlink ..." status_msg "Removing MoonrakerTelegramBot log symlink ..."
rm -f $klipper_cfg_loc/telegram.log && ok_msg "File removed!" rm -f $klipper_cfg_loc/telegram.log && ok_msg "File removed!"
fi fi
CONFIRM_MSG="moonraker-telegram-bot successfully removed!" CONFIRM_MSG="MoonrakerTelegramBot successfully removed!"
} }
remove_mjpg-streamer(){ remove_mjpg-streamer(){

26
scripts/status.sh
View File

@@ -228,28 +228,28 @@ klipperscreen_status(){
fi fi
} }
moonraker-telegram-bot_status(){ MoonrakerTelegramBot_status(){
mtbcount=0 mtbcount=0
moonraker-telegram-bot_data=( MoonrakerTelegramBot_data=(
SERVICE SERVICE
$MOONRAKERTELEGRAMBOT_DIR $MOONRAKERTELEGRAMBOT_DIR
$MOONRAKERTELEGRAMBOT_ENV_DIR $MOONRAKERTELEGRAMBOT_ENV_DIR
) )
### count amount of moonraker-telegram-bot_data service files in /etc/systemd/system ### count amount of MoonrakerTelegramBot_data service files in /etc/systemd/system
SERVICE_FILE_COUNT=$(ls /etc/systemd/system | grep -E "moonraker-telegram-bot" | wc -l) SERVICE_FILE_COUNT=$(ls /etc/systemd/system | grep -E "MoonrakerTelegramBot" | wc -l)
### remove the "SERVICE" entry from the moonraker-telegram-bot_data array if a moonraker-telegram-bot service is installed ### remove the "SERVICE" entry from the MoonrakerTelegramBot_data array if a MoonrakerTelegramBot service is installed
[ $SERVICE_FILE_COUNT -gt 0 ] && unset moonraker-telegram-bot_data[0] [ $SERVICE_FILE_COUNT -gt 0 ] && unset MoonrakerTelegramBot_data[0]
#count+1 for each found data-item from array #count+1 for each found data-item from array
for mtbd in "${moonraker-telegram-bot_data[@]}" for mtbd in "${MoonrakerTelegramBot_data[@]}"
do do
if [ -e $mtbd ]; then if [ -e $mtbd ]; then
mtbcount=$(expr $mtbcount + 1) mtbcount=$(expr $mtbcount + 1)
fi fi
done done
if [ "$mtbccount" == "${#moonraker-telegram-bot_data[*]}" ]; then if [ "$mtbccount" == "${#MoonrakerTelegramBot_data[*]}" ]; then
MOONRAKERTELEGRAMBOT_STATUS="${green}Installed!${default} " MOONRAKERTELEGRAMBOT_STATUS="${green}Installed!${default} "
elif [ "$klsccount" == 0 ]; then elif [ "$klsccount" == 0 ]; then
MOONRAKERTELEGRAMBOT_STATUS="${red}Not installed!${default} " MOONRAKERTELEGRAMBOT_STATUS="${red}Not installed!${default} "
@@ -547,7 +547,7 @@ compare_klipperscreen_versions(){
fi fi
} }
read_moonraker-telegram-bot_versions(){ read_MoonrakerTelegramBot_versions(){
if [ -d $MOONRAKERTELEGRAMBOT_DIR ] && [ -d $MOONRAKERTELEGRAMBOT_DIR/.git ]; then if [ -d $MOONRAKERTELEGRAMBOT_DIR ] && [ -d $MOONRAKERTELEGRAMBOT_DIR/.git ]; then
cd $MOONRAKERTELEGRAMBOT_DIR cd $MOONRAKERTELEGRAMBOT_DIR
git fetch origin master -q git fetch origin master -q
@@ -559,14 +559,14 @@ read_moonraker-telegram-bot_versions(){
fi fi
} }
compare_moonraker-telegram-bot_versions(){ compare_MoonrakerTelegramBot_versions(){
unset MOONRAKERTELEGRAMBOT_UPDATE_AVAIL unset MOONRAKERTELEGRAMBOT_UPDATE_AVAIL
read_moonraker-telegram-bot_versions read_MoonrakerTelegramBot_versions
if [ "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT" != "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT" ]; then if [ "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT" != "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT" ]; then
LOCAL_MOONRAKERTELEGRAMBOT_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT")${default}" LOCAL_MOONRAKERTELEGRAMBOT_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT")${default}"
REMOTE_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT")${default}" REMOTE_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT")${default}"
MOONRAKERTELEGRAMBOT_UPDATE_AVAIL="true" MOONRAKERTELEGRAMBOT_UPDATE_AVAIL="true"
update_arr+=(update_moonraker-telegram-bot) update_arr+=(update_MoonrakerTelegramBot)
else else
LOCAL_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT")${default}" LOCAL_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$LOCAL_MOONRAKERTELEGRAMBOT_COMMIT")${default}"
REMOTE_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT")${default}" REMOTE_MOONRAKERTELEGRAMBOT_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKERTELEGRAMBOT_COMMIT")${default}"
@@ -591,5 +591,5 @@ ui_print_versions(){
compare_mainsail_versions compare_mainsail_versions
compare_fluidd_versions compare_fluidd_versions
compare_klipperscreen_versions compare_klipperscreen_versions
compare_moonraker-telegram-bot compare_MoonrakerTelegramBot
} }

2
scripts/ui/backup_menu.sh
View File

@@ -42,7 +42,7 @@ backup_menu(){
8) 8)
do_action "backup_octoprint" "backup_ui";; do_action "backup_octoprint" "backup_ui";;
9) 9)
do_action "backup_moonraker-telegram-bot" "backup_ui";; do_action "backup_MoonrakerTelegramBot" "backup_ui";;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
*) *)

2
scripts/ui/remove_menu.sh
View File

@@ -44,7 +44,7 @@ remove_menu(){
9) 9)
do_action "remove_mjpg-streamer" "remove_ui";; do_action "remove_mjpg-streamer" "remove_ui";;
10) 10)
do_action "remove_moonraker-telegram-bot" "remove_ui";; do_action "remove_MoonrakerTelegramBot" "remove_ui";;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
*) *)

8
scripts/update.sh
View File

@@ -40,7 +40,7 @@ update_all(){
echo -e "| ${cyan}● KlipperScreen${default} |" echo -e "| ${cyan}● KlipperScreen${default} |"
fi fi
if [ "$MOONRAKERTELEGRAMBOT_UPDATE_AVAIL" = "true" ]; then if [ "$MOONRAKERTELEGRAMBOT_UPDATE_AVAIL" = "true" ]; then
echo -e "| ${cyan}● moonraker-telegram-bot${default} |" echo -e "| ${cyan}● MoonrakerTelegramBot${default} |"
fi fi
if [ "$SYS_UPDATE_AVAIL" = "true" ]; then if [ "$SYS_UPDATE_AVAIL" = "true" ]; then
echo -e "| ${cyan}● System${default} |" echo -e "| ${cyan}● System${default} |"
@@ -173,13 +173,13 @@ update_klipperscreen(){
start_klipperscreen start_klipperscreen
} }
update_moonraker-telegram-bot(){ update_MoonrakerTelegramBot(){
stop_moonraker-telegram-bot stop_MoonrakerTelegramBot
cd $MOONRAKERTELEGRAMBOT_DIR cd $MOONRAKERTELEGRAMBOT_DIR
git pull git pull
./install.sh ./install.sh
ok_msg "Update complete!" ok_msg "Update complete!"
start_moonraker-telegram-bot start_MoonrakerTelegramBot
} }
update_system(){ update_system(){