update any-to-ours and fixes

1 files changed, 5 insertions, 4 deletions

diff --git a/abslibre b/abslibre
index aab71cc..20d931f 100755
--- a/abslibre
+++ b/abslibre
@@ -8,7 +8,8 @@ set -e
 # * Sync bs (abslibre) from bs derivation (abs) excluding from blacklist
 # * Create repo.abs.tar.gz tarballs
 
-. './config'
+platform_name="${platform/\//+}"
+source "$(dirname "$(readlink -e "$0")")/config_${platform_name,,}"
 
 for 'platform' in "${PLATFORMS[@]}"; do
 
@@ -76,11 +77,11 @@ for 'platform' in "${PLATFORMS[@]}"; do
 			arch="$(basename $(dirname ${repo}))"
 
 			# Remove the old one
-			mkdir -p "${FTP_BASE}/${baserepo}/os/${arch}"
-			rm -fv "${FTP_BASE}/${baserepo}/os/${arch}/${baserepo}.abs.tar.gz"
+			mkdir -p "${REPO_DIR}/${baserepo}/os/${arch}"
+			rm -fv "${REPO_DIR}/${baserepo}/os/${arch}/${baserepo}.abs.tar.gz"
 			# Create a new one joining arch and any
 			# Remove the first part of the path (it could be $repo but any isn't hit)
-			bsdtar -czf "${FTP_BASE}/${baserepo}/os/${arch}/${baserepo}.abs.tar.gz" \
+			bsdtar -czf "${REPO_DIR}/${baserepo}/os/${arch}/${baserepo}.abs.tar.gz" \
 				-s ":${BS_MAIN_DIR}/[a-z0-9_]\+/[a-z]\+::" \
 				"${repo}"/* "${BS_MAIN_DIR}/any/${baserepo}"/*