QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/2'

Browse Source 
* qubesos/pr/2:
  Fix parameter expansion for appmenus directory
  Whitelist APPMENUS_DIR setting
  Update in 'help' target for 'make clean' description
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-07 13:49:11 +02:00
commit 1d407d1fc5
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)

2
qubeize_image
View File

@ -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