diff options
author | Eric Hameleers <alien@slackware.com> | 2016-02-16 15:00:41 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-02-16 15:00:41 +0100 |
commit | cf5734babeb10618f793e1414d08ddeab73df897 (patch) | |
tree | e56ce25aeb3dae8e22d18c39c24e75d418ccd73d | |
parent | 74115da8e3fd05a934eb9f271cf8c58fd64376b9 (diff) | |
download | liveslak-cf5734babeb10618f793e1414d08ddeab73df897.tar.gz liveslak-cf5734babeb10618f793e1414d08ddeab73df897.tar.xz |
Fix the flow when rsync-ing a remote repository.
It is a requirement to have the Slackware mirror available locally in advance.
-rwxr-xr-x | make_slackware_live.sh | 8 |
1 files changed, 6 insertions, 2 deletions
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 |