Merge branch 'dev-stable'

Author: Hayao0819

.gitignore

@@ -13,6 +13,4 @@ pkg/
 src/
 out/
 work/
-
-airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
-airootfs/etc/skel/.config/xfce4/desktop/
+*.local.*

Dockerfile

@@ -5,4 +5,4 @@ RUN pacman -S git archiso arch-install-scripts --noconfirm
 RUN git clone https://github.com/SereneTeam/alterlinux.git alterlinux/
 WORKDIR /alterlinux
 RUN git checkout dev-stable
-CMD ["./build.sh", "-c", "zstd"]
+CMD ["./build.sh", "-b"]

Howtobuild_on_docker.md

@@ -1,53 +1,24 @@
 BUILD_SCRIPT = build.sh
+SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter"
+DEBUG_OPTION = -t '-Xcompression-level 1' -x
 
 
-linux:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter"
+xfce:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} xfce
 	@make cleanup
 
-ck :
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k ck
+plasma:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} plasma
 	@make cleanup
 
-lts:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lts
+xfce-test:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} xfce
 	@make cleanup
 
-lqx:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lqx
-	@make cleanup
-
-rt:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k rt
-	@make cleanup
-
-zen:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k zen
-	@make cleanup
-
-test-linux:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -t '-Xcompression-level 1' -x
-	@make cleanup
-
-test-ck:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k ck -t '-Xcompression-level 1' -x
-	@make cleanup
-
-test-lts:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lts -t '-Xcompression-level 1' -x
-	@make cleanup
-
-test-lqx:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lqx -t '-Xcompression-level 1' -x
-	@make cleanup
-
-test-rt:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k rt -t '-Xcompression-level 1' -x
-	@make cleanup
-
-test-zen:
-	@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k zen -t '-Xcompression-level 1' -x
+plasma-test:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} plasma
 	@make cleanup
 
 cleanup:
-	@sudo rm -rf ./work
+	@[[ -d ./work ]] && sudo rm -rf ./work
+	# @[[ -d ./out  ]] && sudo rm -rf ./out