Merge branch 'master' of gitpar:libretools

3 files changed, 11 insertions, 3 deletions

diff --git a/libreaddiff b/libreaddiff
index c8b5214..98646a2 100755
--- a/libreaddiff
+++ b/libreaddiff
@@ -25,7 +25,7 @@ custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
 for arg in "$@" ; do
     case "$arg" in
         -h|--h|--he|--hel|--help|-\?)
-            echo 'Usage: find-pkgs.sh repo [arch]
+            echo 'Usage: libreaddiff repo [arch]
 
 This script outputs a diff of package names and versions in repo
 between pacman'\''s sync db and abslibre checkout.' >&2
diff --git a/librerepkg b/librerepkg
index c33a538..d506003 100755
--- a/librerepkg
+++ b/librerepkg
@@ -51,17 +51,20 @@ makepkgflags=$@
 
 tempdir=$(mktemp -d /tmp/$(basename $PWD).XXXXX)
 
+msg "Copying files"
+cp ./* ${tempdir}/
+
 for _arch in ${arch[@]}; do
-    export CARCH=${_arch}
 
     msg "Repackaging: $pkgname $pkgver-$pkgrel ($(date -u))"
-    cp ./* ${tempdir}/
 
     stdnull pushd ${tempdir}
 
     msg2 "Updating md5sums"
     makepkg -gp rePKGBUILD >> rePKGBUILD
 
+    echo "export CARCH=${_arch}" >> rePKGBUILD
+
     msg "Repackaging using makepkg"
     makepkg -Lcdp rePKGBUILD ${makepkgflags}
 
diff --git a/librestage b/librestage
index d8eae19..b474bb1 100755
--- a/librestage
+++ b/librestage
@@ -99,6 +99,11 @@ for _arch in ${ARCHES[@]}; do
             canonical=""
             for _repo in ${repos[@]}; do
 
+                if [ ! -d "${WORKDIR}/staging/${_repo}" ]; then
+                    warning "[${_repo}] didn't exist, creating..."
+                    mkdir -p "${WORKDIR}/staging/${_repo}"
+                fi
+
                 if [ -z "$canonical" ]; then
                     canonical="${WORKDIR}/staging/${_repo}/${pkgfile}"