From 5bbcaaa096ffba67836114ed9bca2ce431955184d7fb2ed2b62b59185befe5b8 Mon Sep 17 00:00:00 2001 From: pika Date: Sat, 22 Jun 2024 09:27:39 +0200 Subject: [PATCH 1/2] addet some functionality and readability --- .src/gitupdate.sh | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/.src/gitupdate.sh b/.src/gitupdate.sh index 960339c..37042c8 100755 --- a/.src/gitupdate.sh +++ b/.src/gitupdate.sh @@ -1,11 +1,48 @@ #!/bin/bash +# ──────────────────────────────────────< VARIABLES >──────────────────────────────────── +# ─< define the git-directory >─────────────────────────────────────────────────────────── gitdir=$(pwd) + +# ─< define the branch to be pulled >───────────────────────────────────────────────────── branch="main" -if ! command -v git >/dev/null 2>&1; then - echo "Error" -else +# ─< define the format for the date >───────────────────────────────────────────────────── +date=$(date '+%d/%m/%Y %H:%M:%S') + +# ─< log dir and file >─────────────────────────────────────────────────────────────────── +l_dir="$HOME/logs/" +l_file="$HOME/logs/gitupdate.log" +# ────────────────────────────────────< VARIABLES END >────────────────────────────────── + +g_pull () +{ cd $gitdir - git pull origin $branch + git pull origin $branch >>$l_file +} + +l_date () +{ + echo " + _____ + $date + _____ + " >>$l_file +} + +main () +{ +if ! command -v git >/dev/null 2>&1; then + echo "-- Error, git was not found --" +else + if [ -d $HOME/logs/ ]; then + l_date + g_pull + else + mkdir $l_dir + echo "--- Created logs folder under $l_dir ---" + sleep 1 + g_pull + fi fi +} From e4a52dcfa651e971b207fab0563271ffc1338247aab6106b79abd1f35e4abae3 Mon Sep 17 00:00:00 2001 From: pika Date: Sat, 22 Jun 2024 09:30:17 +0200 Subject: [PATCH 2/2] bugfixing --- .src/gitupdate.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.src/gitupdate.sh b/.src/gitupdate.sh index 37042c8..f85ca2d 100755 --- a/.src/gitupdate.sh +++ b/.src/gitupdate.sh @@ -42,7 +42,10 @@ else mkdir $l_dir echo "--- Created logs folder under $l_dir ---" sleep 1 + l_date g_pull fi fi } + +main