From: danix <danix@danix.xyz>
Date: Sat, 25 Apr 2020 18:38:36 +0000 (+0200)
Subject: fixing runtime errors in DOWNLOAD.sh and lxqt.SlackBuild
X-Git-Url: https://git.danix.xyz/?p=lxqt-slackware.git;a=commitdiff_plain;h=b1415a29714c04507d04d3b8a84c9457f7bd67a6

fixing runtime errors in DOWNLOAD.sh and lxqt.SlackBuild
---

diff --git a/DOWNLOAD.sh b/DOWNLOAD.sh
index 3303fd2..7de99ca 100755
--- a/DOWNLOAD.sh
+++ b/DOWNLOAD.sh
@@ -26,7 +26,7 @@ $GIT submodule init || echo "error initializing submodules" >> $ERROR_LOG
 $GIT submodule update --remote --rebase || echo "error during checkout of submodules" >> $ERROR_LOG
 
 # we grab the module's version numbers before deleting everything git related
-sh GRAB_VERSION.sh $SRCDIR
+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
diff --git a/autotools/libfm-extras b/autotools/libfm-extra
similarity index 100%
rename from autotools/libfm-extras
rename to autotools/libfm-extra
diff --git a/lxqt.SlackBuild b/lxqt.SlackBuild
index e4fc66a..8275cf9 100755
--- a/lxqt.SlackBuild
+++ b/lxqt.SlackBuild
@@ -89,6 +89,10 @@ no_usr_share_doc() {
 }
 
 PROGRAM=$1
+SOURCE=$PROGRAM
+if [[ $PROGRAM == 'libfm-extra' ]]; then
+  SOURCE='libfm'
+fi
 VERSION=${VERSION:-0.15.0}
 PKG="$BUILD_DIR/package-${PROGRAM}"
 
@@ -108,7 +112,7 @@ fi
 rm -rf "$PKG" "$TMP/${PROGRAM}-$VERSION"
 
 cd "$TMP"
-cp -R ${CWD}/src/${PROGRAM} $TMP/${PROGRAM}-$VERSION
+cp -R ${CWD}/src/${SOURCE} $TMP/${PROGRAM}-$VERSION
 cd "${PROGRAM}"-$VERSION
 
 fix_perms
@@ -120,12 +124,15 @@ fi
 
 # Check autotools builds before continuing with cmake programs
 if [ -r $CWD/autotools/${PROGRAM} ]; then
+  echo "sourcing autotools settings for $PROGRAM"
   . $CWD/autotools/${PROGRAM}
 else
   if [ -r $CWD/cmake/${PROGRAM} ]; then
+    echo "sourcing cmake settings for $PROGRAM"
     . $CWD/cmake/${PROGRAM}
   else
     # This is the default configure script:
+    echo "setting generic cmake for $PROGRAM"
     . $CWD/cmake/cmake
   fi
 fi
diff --git a/slack-desc/libfm-extra b/slack-desc/libfm-extra
new file mode 100644
index 0000000..38ffa8c
--- /dev/null
+++ b/slack-desc/libfm-extra
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+libfm-extra: libfm-extra
+libfm-extra: Extra files for libfm
+libfm-extra:
+libfm-extra:
+libfm-extra:
+libfm-extra:
+libfm-extra: This package is part of LXQT 0.15.0
+libfm-extra: Mantainer: danix < danix@danix.xyz >
+libfm-extra:
+libfm-extra: Home page: https://github.com/lxqt/lxqt
+libfm-extra: