diff --git a/src/usr/libexec/sbopkg/sqg/functions b/src/usr/libexec/sbopkg/sqg/functions index 93e2f7e..3c2ebb3 100644 --- a/src/usr/libexec/sbopkg/sqg/functions +++ b/src/usr/libexec/sbopkg/sqg/functions @@ -7,7 +7,7 @@ SQG_TMP_DIR=${SQG_TMP_DIR:-/tmp/sqg} # # Sanity checks: -# - sbopkg.conf is available +# - .sbopkg.conf or sbopkg.conf is available # - slackbuilds.org was synced with `rsync` or `git` # - directory checks # @@ -25,12 +25,14 @@ sanity_checks () { . $SBOPKG_CONF fi + # check whether we are using git or rsync if [ -d $REPO_ROOT/$REPO_NAME/.git ]; then REPO_SUBPATH=$REPO_NAME else REPO_SUBPATH=$REPO_NAME/$REPO_BRANCH fi + # check whether the directory exist or not REPO_DIR=$REPO_ROOT/$REPO_SUBPATH if [ ! -w "$QUEUEDIR" ] || [ ! -d "$REPO_DIR" ]; then echo "ERROR: $QUEUEDIR or $REPO_DIR do not exist or are not writable." diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index c9ce14e..76d0d9a 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,6 +1,6 @@ SBOPKG NEWS -sbopkg-dev (2020-01-16 05:55:44 UTC) +sbopkg-dev (2020-03-21 13:25:48 UTC) FEATURES * sqg: Parallelize building of single and all packages by option -j. Patch by Marcel Saegebarth. @@ -57,6 +57,7 @@ sbopkg-dev (2020-01-16 05:55:44 UTC) * Handle upper case value for MD5SUMS * Better handling at git repository during bad network connection. Patch by Urchlay + * sqg: Use /root/.sbopkg.conf if it exists. sbopkg 0.38.1 (2016-09-01 13:42 UTC) FEATURES