From 98ed939e9f00931bbf3f320499b8c6da6a1735b2 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Sat, 8 Sep 2018 18:55:33 -0700 Subject: [PATCH] Have ivan.sh get version from install.sh --- setup/ivan.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup/ivan.sh b/setup/ivan.sh index 48fb377..eb8a957 100755 --- a/setup/ivan.sh +++ b/setup/ivan.sh @@ -6,8 +6,6 @@ # netatalk configured for Apple II use on Debian or Raspbian. # more info is at http://ivanx.com/a2server -a2serverVersion="1.9.0" - # Find the path of our source directory top_src="$( dirname "${BASH_SOURCE[0]}" )/.." pushd $top_src >/dev/null @@ -18,6 +16,9 @@ if [[ ! -f "$top_src/.a2server_source" ]]; then exit 1 fi +# This is now in install.sh, get it from there +a2serverVersion=$(grep '^a2serverVersion' "$top_src/install.sh" | cut -d '"' -f 2) + compare_version="$top_src/scripts/compare_version" isRpi=