Merge branch 'alteriso-3-mainline' into alteriso-3-stable

Author: Hayao0819

.gitignore

@@ -23,4 +23,4 @@ temp/
 .config.old
 system/cpp-src/mkalteriso/CMakeLists.txt.user
 menuconfig-script/kernel_choice_*
-custom.conf
+/custom.conf

.vscode/launch.json

@@ -12,4 +12,4 @@
             "args": []
         }
     ]
-}
+}

Makefile

@@ -7,6 +7,7 @@ ARCH_x86_64  = -a x86_64
 ARCH_i686    = -a i686
 
 
+
 full:mkalteriso
 	@sudo ./fullbuild.sh
 	@make clean
@@ -59,11 +60,11 @@ mkalteriso:
 		mkdir system/cpp-src/mkalteriso/build ;\
 	fi
 	(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
-	
+
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
 	menuconfig/build/mconf menuconfig-script/rootconf
 menuconfig-script/kernel_choice:system/kernel_list-x86_64 system/kernel_list-i686
-	./kernel-choice-conf-gen.sh 
+	./kernel-choice-conf-gen.sh
 build_option:
 	if [ -f .config ];\
 	then \
@@ -78,4 +79,4 @@ build:build_option mkalteriso
 	$(eval BUILD_OPTION := $(shell cat ./.build_option))
 	sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
 keyring::
-	sudo ./keyring.sh --alter-add --arch-add 
+	sudo ./keyring.sh --alter-add --arch-add

build.sh

@@ -8,7 +8,7 @@
 [[ $DISPLAY ]] && shopt -s checkwinsize
 
 # PS1='[\u@\h \W]\$ '
-PS1='\u@\h:\w\$ ' 
+PS1='\u@\h:\w\$ '
 
 [[ -f /etc/bash_aliases ]] && source /etc/bash_aliases
 [[ -f /etc/bash_functions ]] && source /etc/bash_functions

channels/basic/airootfs.any/etc/bash.bashrc

@@ -80,6 +80,9 @@ LocalFileSigLevel = Optional
 [alter-stable]
 Include = /etc/pacman.d/mirrorlist-alter
 
+[dvzrv]
+Server = https://pkgbuild.com/~dvzrv/repo/$arch
+
 [alter-kernel]
 Include = /etc/pacman.d/mirrorlist-alter
 

channels/basic/airootfs.any/etc/pacman.conf

@@ -8,8 +8,7 @@
 #
 # disable-beep.sh
 #
-# Script to disable PC beep sound 
+# Script to disable PC beep sound
 #
 
 setterm -blength 0
-

channels/basic/airootfs.any/etc/profile.d/disable-beep.sh

@@ -1,5 +1,5 @@
-# 
-# Yamada Hayao 
+#
+# Yamada Hayao
 # Twitter: @Hayao0819
 # Email  : hayao@fascode.net
 #
@@ -9,4 +9,4 @@
 #
 
 # no-beep less
-alias less='less -Q'
+alias less='less -Q'

channels/basic/airootfs.any/etc/skel/.aliases

@@ -2,7 +2,7 @@
 # ~/.bashrc
 #
 #
-# Yamada Hayao 
+# Yamada Hayao
 # Twitter: @Hayao0819
 # Email  : hayao@fascode.net
 #
@@ -48,4 +48,4 @@ else
     if [[ "$TERM" != "linux" ]]; then
         PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
     fi
-fi
+fi

channels/basic/airootfs.any/etc/skel/.bashrc

@@ -1 +1 @@
-lsd=true
+lsd=true