From cf5734babeb10618f793e1414d08ddeab73df897 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 16 Feb 2016 15:00:41 +0100
Subject: Fix the flow when rsync-ing a remote repository.

It is a requirement to have the Slackware mirror available locally in advance.
---
 make_slackware_live.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 836970b..8aed168 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -260,8 +260,12 @@ function install_pkgs() {
       exit 1
     fi
 
-    if [ ! -d ${SL_REPO} -o -z "$(find ${SL_REPO} -maxdepth 1 -type f)" ]; then
+    if [ "${SL_REPO}" = "${DEF_SL_REPO}" ]; then
+      # We require that the Slackware package mirror is available:
+      true
+    elif [ ! -d ${SL_REPO} -o -z "$(find ${SL_PKGROOT} -type f 2>/dev/null)" ]; then
       # Oops... empty local repository. Let's see if we can rsync from remote:
+      echo "** Slackware package repository root '${SL_REPO}' does not exist or is empty!"
       RRES=1
       if [ -n "${SL_REPO_URL}" ]; then
         mkdir -p ${SL_REPO}
@@ -273,7 +277,7 @@ function install_pkgs() {
         echo "-- Done rsync-ing from '${SL_REPO_URL}'."
       fi
       if [ $RRES -ne 0 ]; then
-        echo "** Slackware repository root '${SL_REPO}' does not exist or is empty! Exiting."
+        echo "** Exiting."
         exit 1
       fi
     fi
-- 
cgit v1.2.3