From f1bfe7fa8502773bef5902d30c49931d04900311 Mon Sep 17 00:00:00 2001 From: a*morale Date: Thu, 3 Dec 2015 00:08:15 +0100 Subject: [PATCH] [LP-164] - fix Getting Started link in OSX package --- package/Darwin.mk | 1 + package/osx/dmg/Getting Started.webloc | 2 +- package/osx/package | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/Darwin.mk b/package/Darwin.mk index 4df9f8f1e..bb37f397f 100644 --- a/package/Darwin.mk +++ b/package/Darwin.mk @@ -17,6 +17,7 @@ endif BUILD_DIR="$(BUILD_DIR)" \ GCS_BIG_NAME="$(GCS_BIG_NAME)" \ GCS_SMALL_NAME="$(GCS_SMALL_NAME)" \ + WIKI_URL_ROOT="${WIKI_URL_ROOT}" \ PACKAGE_LBL="$(PACKAGE_LBL)" \ PACKAGE_DIR="$(PACKAGE_DIR)" \ PACKAGE_NAME="$(PACKAGE_NAME)" \ diff --git a/package/osx/dmg/Getting Started.webloc b/package/osx/dmg/Getting Started.webloc index 330e929d0..232b07451 100644 --- a/package/osx/dmg/Getting Started.webloc +++ b/package/osx/dmg/Getting Started.webloc @@ -3,6 +3,6 @@ URL - http://wiki.openpilot.org/display/Doc/Getting+Started+Guide + @URL@ diff --git a/package/osx/package b/package/osx/package index 80de04875..3fb8f3012 100755 --- a/package/osx/package +++ b/package/osx/package @@ -16,6 +16,7 @@ rm -rf "${OUT_FILE}" # copy base dmg structure cp -r "${ROOT_DIR}/package/osx/dmg/" "${SRC_DIR}" +sed -i '' s/@URL@/$(echo ${WIKI_URL_ROOT} | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g')/ "${SRC_DIR}/Getting Started.webloc" # packaging goes here cp -a "${APP_PATH}" "${SRC_DIR}"