fixed error when grabbing version numbers and also fixed removal of slack-desc for...

diff --git a/DOWNLOAD.sh b/DOWNLOAD.sh
index 7de99cab7ea8c81239ad65f91ea3923dd539c923..d931ce91d01025b773d1efe9ec774fb281a60435 100755 (executable)
--- 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 ec8d7df61ed1d49ae21bb7040d3396cc8d8837ce..2bbb29db4b62b4766ec7f961f2eefa1d575e06bf 100644 (file)
--- 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