From 9c47a33c9a0896eda85b22a1c0f16e96a27b6450 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 11 Apr 2021 15:52:48 +0200 Subject: Merging upstream version 20210411. Signed-off-by: Daniel Baumann --- share/scripts/curl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'share/scripts/curl') diff --git a/share/scripts/curl b/share/scripts/curl index 465ecbe..98c2b82 100755 --- a/share/scripts/curl +++ b/share/scripts/curl @@ -15,19 +15,21 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . set -e PROJECT="open-infrastructure" SOFTWARE="compute-tools" PROGRAM="container" -SCRIPT="${0}" -HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks" -KEYS="/etc/${PROJECT}/${PROGRAM}/keys" +HOOKS="/etc/${SOFTWARE}/hooks" +KEYS="/etc/${SOFTWARE}/keys" MACHINES="/var/lib/machines" -CACHE="/var/cache/${PROJECT}/${PROGRAM}/system" +CACHE="/var/cache/${PROGRAM}/system" + +SCRIPT="${0}" +export SCRIPT Parameters () { @@ -267,7 +269,7 @@ then Debconf # Run debconf parts - for DEBCONF_SCRIPT in /usr/share/${PROJECT}/${PROGRAM}/scripts/curl.d/* + for DEBCONF_SCRIPT in /usr/share/${SOFTWARE}/scripts/curl.d/* do if [ -x "${DEBCONF_SCRIPT}" ] then -- cgit v1.2.3