Skip to content

Commit 516a28a

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents e43a86e + ceee6a3 commit 516a28a

File tree

24 files changed

+502
-361
lines changed

24 files changed

+502
-361
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
ARGS :=
23
BUILD_SCRIPT := build.sh
34
KERNEL := zen
45
SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
@@ -14,8 +15,8 @@ basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32
1415
$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
1516
$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
1617
@case ${ARCHITECTURE} in\
17-
"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
18-
"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
18+
"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
19+
"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
1920
esac
2021
@make clean
2122

@@ -45,3 +46,7 @@ keyring::
4546

4647
wizard:
4748
@sudo ${CURRENT_DIR}/tools/wizard.sh
49+
50+
check:
51+
@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
52+
@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'

0 commit comments

Comments
 (0)