From d1564aa351764733f8eecd58d0c5fe98ace30132 Mon Sep 17 00:00:00 2001 From: fepitre Date: Fri, 25 Aug 2017 16:00:45 +0200 Subject: [PATCH 1/3] Update in 'help' target for 'make clean' description --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9963c64..e6eb731 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ TIMESTAMP := $(shell date -u +%Y%m%d%H%M) help: @echo "make rpms -- generate template rpm" @echo "make update-repo-installer -- copy newly generated rpm to installer repo" - @echo "make clean -- copy newly generated rpm to installer repo" + @echo "make clean -- remove all files and directories built or added" template-name: @echo $(TEMPLATE_NAME) From 7c053165f3615d4b09157aadd038db76ce001579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 4 Sep 2017 01:24:31 +0200 Subject: [PATCH 2/3] Whitelist APPMENUS_DIR setting --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6eb731..e9d07b8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ endif # expose those variables to template-building scripts TEMPLATE_ENV_WHITELIST += \ DIST DISTRIBUTION TEMPLATE_SCRIPTS TEMPLATE_NAME TEMPLATE_FLAVOR \ - TEMPLATE_FLAVOR_DIR TEMPLATE_OPTIONS \ + TEMPLATE_FLAVOR_DIR TEMPLATE_OPTIONS APPMENUS_DIR \ VERBOSE DEBUG PATH BUILDER_DIR SRC_DIR \ TEMPLATE_ROOT_WITH_PARTITIONS USE_QUBES_REPO_VERSION \ USE_QUBES_REPO_TESTING BUILDER_TURBO_MODE REPO_PROXY From 9a1032e2eb9fd4458b72e88e158f3dddab2e0e68 Mon Sep 17 00:00:00 2001 From: "Frederic Pierret (Epitre)" Date: Wed, 6 Sep 2017 18:59:42 +0200 Subject: [PATCH 3/3] Fix parameter expansion for appmenus directory --- qubeize_image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubeize_image b/qubeize_image index 9d2dbb2..b57c85a 100755 --- a/qubeize_image +++ b/qubeize_image @@ -85,7 +85,7 @@ export INSTALLDIR=mnt # Create App Menus # ------------------------------------------------------------------------------ echo "--> Choosing appmenus whitelists..." -_appmenus_dir="${APPMENUS_DIR-${SCRIPTSDIR}}" +_appmenus_dir="${APPMENUS_DIR:-${SCRIPTSDIR}}" rm -f appmenus if [ -d "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then ln -s "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus