From 1305bca8918789ebd92a69304333346d5e20dadf Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 18 Sep 2019 07:24:26 +0200 Subject: [PATCH] vendor/sunnyvalley: rework this a tiny bit --- vendor/sunnyvalley/+POST_DEINSTALL | 4 ++-- vendor/sunnyvalley/+POST_INSTALL | 24 ++++++++----------- vendor/sunnyvalley/Makefile | 3 +-- ...nf.shadow.in => SunnyValley.conf.template} | 0 4 files changed, 13 insertions(+), 18 deletions(-) rename vendor/sunnyvalley/src/etc/pkg/repos/{SunnyValley.conf.shadow.in => SunnyValley.conf.template} (100%) diff --git a/vendor/sunnyvalley/+POST_DEINSTALL b/vendor/sunnyvalley/+POST_DEINSTALL index 4729ff761..98bb7c983 100644 --- a/vendor/sunnyvalley/+POST_DEINSTALL +++ b/vendor/sunnyvalley/+POST_DEINSTALL @@ -1,3 +1,3 @@ +REPO_FILE=/usr/local/etc/pkg/repos/SunnyValley.conf -rm -f /usr/local/etc/pkg/repos/SunnyValley.conf - +rm -f "${REPO_FILE}" diff --git a/vendor/sunnyvalley/+POST_INSTALL b/vendor/sunnyvalley/+POST_INSTALL index de4c43fef..5d7534ec0 100644 --- a/vendor/sunnyvalley/+POST_INSTALL +++ b/vendor/sunnyvalley/+POST_INSTALL @@ -1,16 +1,12 @@ - OPNSENSE_FLAVOR=$(/usr/local/sbin/opnsense-version -f) +REPO_FILE=/usr/local/etc/pkg/repos/SunnyValley.conf -if [ "${OPNSENSE_FLAVOR}" == "OpenSSL" ]; then - echo "Configuring repository for OpenSSL flavor" -elif [ "${OPNSENSE_FLAVOR}" == "LibreSSL" ]; then - echo "Configuring repository for LibreSSL flavor" -else - echo "Unsupported OPNsense flavor, aborting" - exit 1 -fi - -cat /usr/local/etc/pkg/repos/SunnyValley.conf.shadow.in | sed "s/%%FLAVOR%%/${OPNSENSE_FLAVOR}/g" > /usr/local/etc/pkg/repos/SunnyValley.conf - - - +case "${OPNSENSE_FLAVOR}" in +OpenSSL|LibreSSL) + echo "Configuring repository for ${OPNSENSE_FLAVOR} flavor" + sed "s/%%FLAVOR%%/${OPNSENSE_FLAVOR}/g" "${REPO_FILE}".template > "${REPO_FILE}" + ;; +*) + echo "Unsupported OPNsense flavor (${OPNSENSE_FLAVOR}), aborting" + ;; +esac diff --git a/vendor/sunnyvalley/Makefile b/vendor/sunnyvalley/Makefile index 6d5e14f68..9fbb719a7 100644 --- a/vendor/sunnyvalley/Makefile +++ b/vendor/sunnyvalley/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= sunnyvalley -PLUGIN_VERSION= 1.0 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.1 PLUGIN_COMMENT= Sunny Valley Networks Vendor Repository PLUGIN_MAINTAINER= opensource@sunnyvalley.io diff --git a/vendor/sunnyvalley/src/etc/pkg/repos/SunnyValley.conf.shadow.in b/vendor/sunnyvalley/src/etc/pkg/repos/SunnyValley.conf.template similarity index 100% rename from vendor/sunnyvalley/src/etc/pkg/repos/SunnyValley.conf.shadow.in rename to vendor/sunnyvalley/src/etc/pkg/repos/SunnyValley.conf.template