From aec7aba53093eede74a4aa1310331c3c967698a7 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Mon, 14 Apr 2025 11:54:23 -0700 Subject: [PATCH] This addresses the 2 issues #1961 and #2061 in loadup building (#2103) 1961 - RDSYS incomplete path for copying 2061 - delay starting making loadups due to "expensive" operation just to check if connected dir is inside of a git repo --- scripts/copy-all.sh | 4 ++-- scripts/copy-full.sh | 4 ++-- scripts/loadup-setup.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh index aebec2b4..e120d26e 100755 --- a/scripts/copy-all.sh +++ b/scripts/copy-all.sh @@ -36,9 +36,9 @@ main() { fi - /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS library \ + /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS "${MEDLEYDIR}"/library \ | sed -e "s#${MEDLEYDIR}/##g" - /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS.LCOM library \ + /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS.LCOM "${MEDLEYDIR}"/library \ | sed -e "s#${MEDLEYDIR}/##g" diff --git a/scripts/copy-full.sh b/scripts/copy-full.sh index 59ace2c8..fb2d4fab 100755 --- a/scripts/copy-full.sh +++ b/scripts/copy-full.sh @@ -18,9 +18,9 @@ main() { /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/full.dribble "${LOADUP_OUTDIR}" \ | sed -e "s#${MEDLEYDIR}/##g" - /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS library \ + /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS "${MEDLEYDIR}"/library \ | sed -e "s#${MEDLEYDIR}/##g" - /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS.LCOM library \ + /bin/sh "${LOADUP_SCRIPTDIR}/cpv" "${LOADUP_WORKDIR}"/RDSYS.LCOM "${MEDLEYDIR}"/library \ | sed -e "s#${MEDLEYDIR}/##g" echo "<<<<< END ${script_name}" diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh index 87a145fa..bb1d5b34 100644 --- a/scripts/loadup-setup.sh +++ b/scripts/loadup-setup.sh @@ -56,7 +56,7 @@ export HAS_GIT is_git_dir () { if ${HAS_GIT} then - return $(cd "$1"; git status >/dev/null 2>/dev/null; echo $?) + return $(git -C "$1" rev-parse >/dev/null 2>/dev/null; echo $?) else return 1 fi