From bda07dd821aaf2fb4b4da6453d21d50367ab230a Mon Sep 17 00:00:00 2001 From: Christian Schendel Date: Sat, 6 Sep 2025 22:03:37 +0200 Subject: [PATCH] fix forgejo uploader --- upload-to-forgejo-repo | 45 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/upload-to-forgejo-repo b/upload-to-forgejo-repo index 95f66b2..e65fa6d 100755 --- a/upload-to-forgejo-repo +++ b/upload-to-forgejo-repo @@ -9,6 +9,18 @@ color_ok="\e[1;32m==>\e[0m" color_error="\e[1;31m==>\e[0m" color_warning="\e[1;35m==>\e[0m" +show_cursor() { + tput cnorm + exit 1 +} + +hide_cursor() { + tput civis +} + +trap show_cursor INT TERM +hide_cursor + ## check for config file if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/upload-to-dalci-repo.cfg" ]]; then configfile="${XDG_CONFIG_HOME:-$HOME/.config}/upload-to-dalci-repo.cfg" @@ -24,8 +36,7 @@ EOF echo -e "\b$color_note example configuration created at" echo -e "\b$color_note ${XDG_CONFIG_HOME:-$HOME/.config}/upload-to-dalci-repo.cfg" echo -e "\b$color_warning please edit it before running this script again" - - exit 1 + show_cursor fi # secure the config file @@ -38,25 +49,12 @@ while IFS= read -r line; do done </dev/null; do i=$(((i + 1) % 4)) @@ -65,11 +63,22 @@ show_progress() { sleep .1 done } +check_for_pkg() { + pkg=$(find ./ -type f -name "*.pkg.tar.zst") + if [ ! -z "$pkg" ]; then + : + else + echo -e "\b$color_error no packges found." + echo -e "\b\tPlease run this script from inside the directory" + echo -e "\b\twhich holds the Arch-packages." + echo -e "\b$color_ok Exiting now." + show_cursor + fi +} upload_package() { for file in ./*; do if [[ "$file" != *.pkg.tar.zst ]]; then - echo -e "\b$color_error No arch packages found" exit 1 else echo -e "\b$color_note uploading $file" @@ -82,6 +91,6 @@ upload_package() { done echo -e "\b$color_ok packges uploaded" } - +check_for_pkg upload_package & show_progress $! show_cursor