From c01fcab132e43e8d2a603db692a66d867acf99ee Mon Sep 17 00:00:00 2001 From: danix Date: Sat, 25 Apr 2020 21:18:37 +0200 Subject: [PATCH] fixed error when grabbing version numbers and also fixed removal of slack-desc for libfm-extra --- DOWNLOAD.sh | 5 ++++- slack-desc/CHECK_SLACKDESC.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DOWNLOAD.sh b/DOWNLOAD.sh index 7de99ca..d931ce9 100755 --- a/DOWNLOAD.sh +++ b/DOWNLOAD.sh @@ -25,10 +25,13 @@ $GIT submodule init || echo "error initializing submodules" >> $ERROR_LOG # checkout every submodule $GIT submodule update --remote --rebase || echo "error during checkout of submodules" >> $ERROR_LOG +# return to main directory +cd $CWD + # we grab the module's version numbers before deleting everything git related sh ${CWD}/GRAB_VERSION.sh $SRCDIR # we are done with git, so let's cleanup from all the unwanted git folders and files -find . -name '.git*' -mindepth 1 -exec rm -rfv '{}' \; || echo "error during removal of git files from source" >> $ERROR_LOG +find $SRCDIR -name '.git*' -mindepth 1 -exec rm -rfv '{}' \; || echo "error during removal of git files from source" >> $ERROR_LOG # ALL DONE diff --git a/slack-desc/CHECK_SLACKDESC.sh b/slack-desc/CHECK_SLACKDESC.sh index ec8d7df..2bbb29d 100644 --- a/slack-desc/CHECK_SLACKDESC.sh +++ b/slack-desc/CHECK_SLACKDESC.sh @@ -17,7 +17,7 @@ done FILES=$(/bin/ls $CWD) for f in $FILES; do if [ "$(grep -Poc $f ../modules.txt)" -lt 1 ]; then - if [[ $f != "CHECK_SLACKDESC.sh" && $f != "make_slack-desc.sh" ]]; then + if [[ $f != "CHECK_SLACKDESC.sh" && $f != "make_slack-desc.sh" && != "libfm-extra" ]]; then rm $f fi fi -- 2.20.1