diff --git a/archiso/airootfs/etc/default/grub b/archiso/airootfs/etc/default/grub index 9495e98..6db5c6e 100755 --- a/archiso/airootfs/etc/default/grub +++ b/archiso/airootfs/etc/default/grub @@ -43,7 +43,7 @@ GRUB_DISABLE_RECOVERY=true #GRUB_COLOR_HIGHLIGHT="light-cyan/blue" # Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" +GRUB_BACKGROUND="/boot/grub/background.png" #GRUB_THEME="/path/to/gfxtheme" # Uncomment to get a beep at GRUB start diff --git a/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch b/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch deleted file mode 100755 index e2bbfa2..0000000 --- a/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -#set -e -############################################################################### -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -############################################################################### -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -############################################################################### - -#if necessary we can use this script too diff --git a/archiso/airootfs/usr/local/bin/get-chadwm b/archiso/airootfs/usr/local/bin/get-chadwm deleted file mode 100755 index 1d3563d..0000000 --- a/archiso/airootfs/usr/local/bin/get-chadwm +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/bash -#set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.alci.online -# Website : https://www.ariser.eu -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -################################################################################################################## -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## -#tput setaf 0 = black -#tput setaf 1 = red -#tput setaf 2 = green -#tput setaf 3 = yellow -#tput setaf 4 = dark blue -#tput setaf 5 = purple -#tput setaf 6 = cyan -#tput setaf 7 = gray -#tput setaf 8 = light blue -################################################################################################################## - -installed_dir=$(dirname $(readlink -f $(basename `pwd`))) - -################################################################################################################## - -sudo pacman -Syyu -sudo pacman -S wget --noconfirm --needed -sudo pacman -S jq --noconfirm --needed -arco_repo_db=$(wget -qO- https://api.github.com/repos/arcolinux/arcolinux_repo/contents/x86_64) -echo "Getting the ArcoLinux keys from the ArcoLinux repo" - -sudo wget "$(echo "$arco_repo_db" | jq -r '[.[] | select(.name | contains("arcolinux-keyring")) | .name] | .[0] | sub("arcolinux-keyring-"; "https://github.com/arcolinux/arcolinux_repo/raw/main/x86_64/arcolinux-keyring-")')" -O /tmp/arcolinux-keyring-git-any.pkg.tar.zst -sudo pacman -U --noconfirm --needed /tmp/arcolinux-keyring-git-any.pkg.tar.zst - -###################################################################################################################### - -echo "Getting the latest arcolinux mirrors file" - -sudo wget "$(echo "$arco_repo_db" | jq -r '[.[] | select(.name | contains("arcolinux-mirrorlist-git-")) | .name] | .[0] | sub("arcolinux-mirrorlist-git-"; "https://github.com/arcolinux/arcolinux_repo/raw/main/x86_64/arcolinux-mirrorlist-git-")')" -O /tmp/arcolinux-mirrorlist-git-any.pkg.tar.zst -sudo pacman -U --noconfirm --needed /tmp/arcolinux-mirrorlist-git-any.pkg.tar.zst - -if grep -q arcolinux_repo /etc/pacman.conf; then - - echo - tput setaf 2 - echo "################################################################" - echo "################ ArcoLinux repos are already in /etc/pacman.conf " - echo "################################################################" - tput sgr0 - echo - -else - -echo ' - -#[arcolinux_repo_testing] -#SigLevel = PackageRequired DatabaseNever -#Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo] -SigLevel = PackageRequired DatabaseNever -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_3party] -SigLevel = PackageRequired DatabaseNever -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_xlarge] -SigLevel = PackageRequired DatabaseNever -Include = /etc/pacman.d/arcolinux-mirrorlist' | sudo tee --append /etc/pacman.conf - -fi - - -sudo pacman -Sy - - - -func_install() { - if pacman -Qi $1 &> /dev/null; then - tput setaf 2 - echo "###############################################################################" - echo "################## The package "$1" is already installed" - echo "###############################################################################" - echo - tput sgr0 - else - tput setaf 3 - echo "###############################################################################" - echo "################## Installing package " $1 - echo "###############################################################################" - echo - tput sgr0 - sudo pacman -S --noconfirm --needed $1 - fi -} - -func_install_chadwm() { - - echo - tput setaf 2 - echo "################################################################" - echo "################### Install chadwm" - echo "################################################################" - tput sgr0 - echo - - list=( - alacritty - archlinux-logout-git - arconet-variety-config - arcolinux-chadwm-git - arcolinux-chadwm-pacman-hook-git - arcolinux-powermenu-git - dash - dmenu - eww - feh - lxappearance - picom - polkit-gnome - rofi-lbonn-wayland - scrot - sxhkd - thunar - thunar-archive-plugin - thunar-volman - ttf-hack - ttf-jetbrains-mono-nerd - ttf-meslo-nerd-font-powerlevel10k - volumeicon - xfce4-notifyd - xfce4-power-manager - xfce4-screenshooter - xfce4-settings - xfce4-taskmanager - xfce4-terminal - ) - - count=0 - - for name in "${list[@]}" ; do - count=$[count+1] - tput setaf 3;echo "Installing package nr. "$count " " $name;tput sgr0; - func_install $name - done -} - -func_install_chadwm - -cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H.%M.%S) -cp -arf /etc/skel/. ~ diff --git a/archiso/airootfs/usr/local/bin/get-nemesis-on-alci b/archiso/airootfs/usr/local/bin/get-nemesis-on-alci deleted file mode 100755 index 5a69d41..0000000 --- a/archiso/airootfs/usr/local/bin/get-nemesis-on-alci +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -#set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.alci.online -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -################################################################################################################## -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## -#tput setaf 0 = black -#tput setaf 1 = red -#tput setaf 2 = green -#tput setaf 3 = yellow -#tput setaf 4 = dark blue -#tput setaf 5 = purple -#tput setaf 6 = cyan -#tput setaf 7 = gray -#tput setaf 8 = light blue -################################################################################################################## - -#iso=alci-iso - -echo -tput setaf 3 -echo "################################################################" -echo "################### Start clone arcolinux-nemesis" -echo "################################################################" -tput sgr0 -echo - -sudo pacman -Sy git --noconfirm --needed - -[ -d $HOME"/DATA" ] || mkdir -p $HOME"/DATA" -cd ~/DATA -git clone https://github.com/erikdubois/arcolinux-nemesis - -echo -tput setaf 3 -echo "################################################################" -echo "################### End clone arcolinux-nemesis" -echo "################################################################" -tput sgr0 -echo \ No newline at end of file diff --git a/archiso/airootfs/boot/grub/background.png b/archiso/grub/background.png similarity index 100% rename from archiso/airootfs/boot/grub/background.png rename to archiso/grub/background.png diff --git a/archiso/grub/fonts/unicode.pf2 b/archiso/grub/fonts/unicode.pf2 new file mode 100644 index 0000000..2b29307 Binary files /dev/null and b/archiso/grub/fonts/unicode.pf2 differ diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 1c412c3..d9393e1 100755 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -11,10 +11,13 @@ insmod udf # Use graphics-mode output if loadfont "${prefix}/fonts/unicode.pf2" ; then insmod all_video + insmod gfxterm + set gfxmode="auto" terminal_input console - terminal_output console + terminal_output gfxterm set background_image="/boot/grub/background.png" + fi # Enable serial console diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 96d41ea..c876622 100755 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -134,7 +134,7 @@ zsh calamares kcrash -bbt-calamares-config +tms-calamares-config ####################################################### diff --git a/archiso/pacman.conf b/archiso/pacman.conf index 30208f2..1f0dae4 100755 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -72,21 +72,14 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#you can create packages and put them on your local repo -#the folder should be on your homedirectory with the name alci_local_repo -#see uploaded example -there is a copy of the local repo in your folder -#Copy/paste it to your homefolder -#update the packages database -#Change the name erik to your own username - #[core-testing] #Include = /etc/pacman.d/mirrorlist [custom] SigLevel = Optional TrustAll -#Server = https://git.yuyujing.cn/zj/custompkgs/raw/x86_64/ +Server = http://192.168.10.207:3000/zj/custompkgs/raw/x86_64/ #Server = https://mirror.yuyujing.cn/archlinux/os/$arch -Server = http://192.168.1.56:5255/d/mirrors/archlinux/os/x86_64 +#Server = http://192.168.1.56:5255/d/mirrors/archlinux/os/x86_64 [core] Include = /etc/pacman.d/mirrorlist @@ -114,12 +107,5 @@ Include = /etc/pacman.d/mirrorlist #Server = file:///home/custompkgs -#more repositories here : -#https://wiki.archlinux.org/index.php/unofficial_user_repositories - -#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 -#[chaotic-aur] -#Include = /etc/pacman.d/chaotic-mirrorlist - [archlinuxcn] Server = https://mirrors.ustc.edu.cn/archlinuxcn/$arch diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index 4e276f0..ea0210d 100755 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -24,12 +24,9 @@ file_permissions=( ["/usr/local/bin/livecd-sound"]="0:0:755" ["/etc/polkit-1/rules.d"]="0:0:750" ["/etc/sudoers.d"]="0:0:750" - ["/usr/local/bin/alci-make-a-pure-arch"]="0:0:755" ["/usr/local/bin/alci-displaymanager-check"]="0:0:755" ["/usr/local/bin/alci-virtual-machine-check"]="0:0:755" - ["/usr/local/bin/get-nemesis-on-alci"]="0:0:755" ["/usr/local/bin/fix-keys"]="0:0:755" - ["/usr/local/bin/get-chadwm"]="0:0:755" ["/media/cinema/"]="1001:1001:777" ["/media/kdm/"]="1002:1002:777" ["/home/smart/.mozilla/"]="0:0:777" diff --git a/installation-scripts/tms-40-build-the-iso-local-again.sh b/installation-scripts/tms-40-build-the-iso-local-again.sh index abacdf2..5f66742 100755 --- a/installation-scripts/tms-40-build-the-iso-local-again.sh +++ b/installation-scripts/tms-40-build-the-iso-local-again.sh @@ -1,20 +1,5 @@ #!/bin/bash #set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.online -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -# Website : https://www.alci.online -################################################################################################################## -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## # 获取脚本所在的目录 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" @@ -166,97 +151,6 @@ echo #cp -r ../archiso $buildFolder/archiso cp -r "$PROJECT_ROOT/archiso" "$buildFolder/archiso" -# echo -# echo "################################################################## " -# tput setaf 2 -# echo "Phase 4 :" -# echo "- Deleting any files in /etc/skel" -# echo "- Getting the last version of bashrc in /etc/skel" -# echo "- Removing the old packages.x86_64 file from build folder" -# echo "- Copying the new packages.x86_64 file to the build folder" -# echo "- Changing group for polkit folder" -# tput sgr0 -# echo "################################################################## " -# echo - -# echo "Deleting any files in /etc/skel" -# rm -rf $buildFolder/archiso/airootfs/etc/skel/.* 2> /dev/null -# echo - -# echo "Getting the last version of bashrc in /etc/skel" -# echo -# wget https://raw.githubusercontent.com/arcolinux/arcolinux-root/master/etc/skel/.bashrc-latest -O $buildFolder/archiso/airootfs/etc/skel/.bashrc - -# echo "Removing the old packages.x86_64 file from build folder" -# rm $buildFolder/archiso/packages.x86_64 -# echo -# echo "Copying the new packages.x86_64 file to the build folder" -# cp -f ../archiso/packages.x86_64 $buildFolder/archiso/packages.x86_64 -# echo -# echo "Changing group for polkit folder" -# sudo chgrp polkitd $buildFolder/archiso/airootfs/etc/polkit-1/rules.d -# #is not working so fixing this during calamares installation - -# echo -# echo "################################################################## " -# tput setaf 2 -# echo "Phase 5 : " -# echo "- Changing all references" -# echo "- Adding time to /etc/dev-rel" -# tput sgr0 -# echo "################################################################## " -# echo -# -# #Setting variables -# -# #profiledef.sh -# oldname1='iso_name=arcolinux' -# newname1='iso_name=arcolinux' -# -# oldname2='iso_label="arcolinux' -# newname2='iso_label="arcolinux' -# -# oldname3='ArcoLinux' -# newname3='ArcoLinux' -# -# #hostname -# oldname4='ArcoLinux' -# newname4='ArcoLinux' -# -# #lightdm.conf user-session -# oldname5='user-session=xfce' -# newname5='user-session='$lightdmDesktop -# -# #lightdm.conf autologin-session -# oldname6='#autologin-session=' -# newname6='autologin-session='$lightdmDesktop -# -# echo "Changing all references" -# echo -# sed -i 's/'$oldname1'/'$newname1'/g' $buildFolder/archiso/profiledef.sh -# sed -i 's/'$oldname2'/'$newname2'/g' $buildFolder/archiso/profiledef.sh -# sed -i 's/'$oldname3'/'$newname3'/g' $buildFolder/archiso/airootfs/etc/dev-rel -# sed -i 's/'$oldname4'/'$newname4'/g' $buildFolder/archiso/airootfs/etc/hostname -# sed -i 's/'$oldname5'/'$newname5'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf -# sed -i 's/'$oldname6'/'$newname6'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf -# -# echo "Adding time to /etc/dev-rel" -# date_build=$(date -d now) -# echo "Iso build on : "$date_build -# sudo sed -i "s/\(^ISO_BUILD=\).*/\1$date_build/" $buildFolder/archiso/airootfs/etc/dev-rel - - -#echo -#echo "################################################################## " -#tput setaf 2 -#echo "Phase 6 :" -#echo "- Cleaning the cache from /var/cache/pacman/pkg/" -#tput sgr0 -#echo "################################################################## " -#echo - - #echo "Cleaning the cache from /var/cache/pacman/pkg/" - #yes | sudo pacman -Scc echo echo "################################################################## " @@ -271,51 +165,11 @@ echo cd $buildFolder/archiso/ sudo mkarchiso -v -w $buildFolder -o $outFolder $buildFolder/archiso/ - - -# echo -# echo "###################################################################" -# tput setaf 2 -# echo "Phase 8 :" -# echo "- Creating checksums" -# echo "- Copying pgklist" -# tput sgr0 -# echo "###################################################################" -# echo -# -# cd $outFolder -# -# echo "Creating checksums for : "$isoLabel -# echo "##################################################################" -# echo -# echo "Building sha1sum" -# echo "########################" -# sha1sum $isoLabel | tee $isoLabel.sha1 -# echo "Building sha256sum" -# echo "########################" -# sha256sum $isoLabel | tee $isoLabel.sha256 -# echo "Building md5sum" -# echo "########################" -# md5sum $isoLabel | tee $isoLabel.md5 -# echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) cp $buildFolder/iso/BBTTMS/pkglist.x86_64.txt $outFolder/BBTTMS-$rename-pkglist.txt - -#echo -#echo "##################################################################" -#tput setaf 2 -#echo "Phase 9 :" -#echo "- Making sure we start with a clean slate next time" -#tput sgr0 -#echo "################################################################## " -#echo - - #echo "Deleting the build folder if one exists - takes some time" - #[ -d $buildFolder ] && sudo rm -rf $buildFolder - echo echo "##################################################################" tput setaf 2