2 次代码提交 e821d620c4 ... 5fa7ffdd29

作者 SHA1 备注 提交日期
  Alex 5fa7ffdd29 Small bug fixes 9 月之前
  Alex f61561936e install_void: small bug fixes 9 月之前
共有 3 个文件被更改,包括 59 次插入83 次删除
  1. 1 2
      install_void.sh
  2. 0 51
      void_add.sh
  3. 58 30
      void_interface.sh

+ 1 - 2
install_void.sh

@@ -9,7 +9,7 @@
 #############################################################################
 # Autor:Alex Ham
 # Email:kandil@disroot.org
-# Description:this script install os gnu/linux voidlinux on usb or hdd drives
+# Description:This script install os gnu/linux voidlinux on usb or hdd drives
 # Dependencies:xz, curl
 # Signs:
 #	[-]=waiting
@@ -37,7 +37,6 @@ fs_type="ext4"
 sys_hostname="voidpc"
 sys_language="en_US.UTF-8"
 sys_locale="en_US.UTF-8 UTF-8"
-# sys_pkg_list="list.pkg"
 user_groups="wheel,floppy,cdrom,optical,audio,video,kvm,plugdev"
 grub_discards="rd.luks.allow-discards"
 rootfs_link="https://repo-default.voidlinux.org/live/current/void-x86_64-ROOTFS-20230628.tar.xz"

+ 0 - 51
void_add.sh

@@ -1,51 +0,0 @@
-#!/bin/env bash
-#############################################################################
-# Colors
-cl_black=$'\e[30m'
-cl_red=$'\e[31m'
-cl_green=$'\e[32m'
-cl_yellow=$'\e[33m'
-cl_blue=$'\e[34m'
-cl_magenta=$'\e[35m'
-cl_cyan=$'\e[36m'
-cl_white=$'\e[37m'
-cl_bright=$'\e[1m'
-cl_normal=$'\e[0m'
-#############################################################################
-# ENV
-luks_name="lukspc"
-lvm_group_name="lvmpc"
-fs_type="ext4"
-sys_lang="LANG=en_US.UTF-8"
-sys_locale="en_US.UTF-8 UTF-8"
-sys_hostname="voidpc"
-sys_pkg_list="list.pkg"
-void_repo="https://repo-default.voidlinux.org/current"
-user_groups="wheel,floppy,cdrom,optical,audio,video,kvm,plugdev"
-grub_discards="rd.luks.allow-discards"
-run_dev=$(lsblk -slnpo NAME $(df --output=source / | sed 1d) | tail -n1)
-user_name="alex"
-user_full_name="Alex Ham"
-user_pass="q"
-#############################################################################
-printf "%s=======================%s\n" "${cl_green}" "${cl_normal}"
-printf "%s[*] Additional commands%s\n" "${cl_green}" "${cl_normal}"
-printf "%s=======================%s\n" "${cl_green}" "${cl_normal}"
-
-# Installing utilities
-chroot /mnt xbps-install git stow >/dev/null
-
-# Clone my repositorys
-git clone git@git.disroot.org:kandil/dotfiles.git \
-	/mnt/home/${user_name}/.dotfiles
-git clone git@git.disroot.org:kandil/voidrice.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/st.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/dwm.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/slstatus.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/translater.git /mnt/home/${user_name}
-
-# Symlinks to configs and daemons
-chroot /mnt stow -Svn /home/${user_name}/.dotfiles/*
-ln -s /mnt/etc/sv/{tor,dbus,dhcpcd} /mnt/var/service
-cp -r /mnt/home/${user_name}/{voidrice,st,dwm} \
-	/mnt/home/${user_name}/.local/progs/

+ 58 - 30
void_interface.sh

@@ -1,51 +1,79 @@
 #!/bin/env bash
 #############################################################################
+# ██╗   ██╗ ██████╗ ██╗██████╗     ██╗███╗   ██╗███████╗████████╗ █████╗ ██╗     ██╗     ███████╗██████╗
+# ██║   ██║██╔═══██╗██║██╔══██╗    ██║████╗  ██║██╔════╝╚══██╔══╝██╔══██╗██║     ██║     ██╔════╝██╔══██╗
+# ██║   ██║██║   ██║██║██║  ██║    ██║██╔██╗ ██║███████╗   ██║   ███████║██║     ██║     █████╗  ██████╔╝
+# ╚██╗ ██╔╝██║   ██║██║██║  ██║    ██║██║╚██╗██║╚════██║   ██║   ██╔══██║██║     ██║     ██╔══╝  ██╔══██╗
+#  ╚████╔╝ ╚██████╔╝██║██████╔╝    ██║██║ ╚████║███████║   ██║   ██║  ██║███████╗███████╗███████╗██║  ██║
+#   ╚═══╝   ╚═════╝ ╚═╝╚═════╝     ╚═╝╚═╝  ╚═══╝╚══════╝   ╚═╝   ╚═╝  ╚═╝╚══════╝╚══════╝╚══════╝╚═╝  ╚═╝
+#############################################################################
+# Autor:Alex Ham
+# Email:kandil@disroot.org
+# Description:This script will install the necessary and additional progs in the psemdo system
+# Dependencies:
+# Signs:
+#	[-]=waiting
+#	[+]=successful
+#	[!]=warning
+#	[*]=info
+#	[?]=aksing
+#############################################################################
 # Colors
-cl_black=$'\e[30m'
+# cl_black=$'\e[30m'
+# cl_yellow=$'\e[33m'
+# cl_magenta=$'\e[35m'
+# cl_cyan=$'\e[36m'
+# cl_white=$'\e[37m'
+# cl_bright=$'\e[1m'
 cl_red=$'\e[31m'
 cl_green=$'\e[32m'
-cl_yellow=$'\e[33m'
 cl_blue=$'\e[34m'
-cl_magenta=$'\e[35m'
-cl_cyan=$'\e[36m'
-cl_white=$'\e[37m'
-cl_bright=$'\e[1m'
 cl_normal=$'\e[0m'
 #############################################################################
 # ENV
-luks_name="lukspc"
-lvm_group_name="lvmpc"
-fs_type="ext4"
-sys_lang="LANG=en_US.UTF-8"
-sys_locale="en_US.UTF-8 UTF-8"
-sys_hostname="voidpc"
+# luks_name="lukspc"
+# lvm_name="lvmpc"
+# fs_type="ext4"
+# sys_hostname="voidpc"
+# sys_language="en_US.UTF-8"
+# sys_locale="en_US.UTF-8 UTF-8"
+# user_groups="wheel,floppy,cdrom,optical,audio,video,kvm,plugdev"
+# grub_discards="rd.luks.allow-discards"
+# rootfs_link="https://repo-default.voidlinux.org/live/current/void-x86_64-ROOTFS-20230628.tar.xz"
 sys_pkg_list="list.pkg"
-void_repo="https://repo-default.voidlinux.org/current"
-user_groups="wheel,floppy,cdrom,optical,audio,video,kvm,plugdev"
-grub_discards="rd.luks.allow-discards"
-run_dev=$(lsblk -slnpo NAME $(df --output=source / | sed 1d) | tail -n1)
-user_name="alex"
-user_full_name="Alex Ham"
-user_pass="q"
+# run_dev=$(lsblk -slnpo NAME $(df --output=source / | sed 1d) | tail -n1)
+user_name=alex
 #############################################################################
+# Start
+
 printf "%s=======================%s\n" "${cl_green}" "${cl_normal}"
 printf "%s[*] Additional commands%s\n" "${cl_green}" "${cl_normal}"
 printf "%s=======================%s\n" "${cl_green}" "${cl_normal}"
 
-# Installing utilities
+# Installing utilities(git, stow)
+printf "[-] Installation utilities(git, stow)"
 chroot /mnt xbps-install git stow >/dev/null
 
-# Clone my repositorys
+# Cloning repositorys
+printf "[-] Cloning repositorys"
 git clone git@git.disroot.org:kandil/dotfiles.git \
-	/mnt/home/${user_name}/.dotfiles
-git clone git@git.disroot.org:kandil/voidrice.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/st.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/dwm.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/slstatus.git /mnt/home/${user_name}
-git clone git@git.disroot.org:kandil/translater.git /mnt/home/${user_name}
+	/mnt/home/"${user_name}"/.dotfiles
+git clone git@git.disroot.org:kandil/voidrice.git \
+	/mnt/home/"${user_name}"/.local/progs/voidrice
+git clone git@git.disroot.org:kandil/st.git \
+	/mnt/home/"${user_name}"/.local/progs/st
+git clone git@git.disroot.org:kandil/dwm.git \
+	/mnt/home/"${user_name}"/.local/progs/dwm
+git clone git@git.disroot.org:kandil/slstatus.git \
+	/mnt/home/"${user_name}"/.local/progs/slstatus
+git clone git@git.disroot.org:kandil/translater.git \
+	/mnt/home/"${user_name}"/translater
+
+# Moving the translater to the program directory
+printf "[+] Moving the translater to the program directory"
+mv /mnt/home/"${user_name}"/translater \
+	/mnt/home/"${user_name}"/.local/bin/translater
 
 # Symlinks to configs and daemons
-chroot /mnt stow -Svn /home/${user_name}/.dotfiles/*
+chroot /mnt stow -Svn /home/"${user_name}"/.dotfiles/*
 ln -s /mnt/etc/sv/{tor,dbus,dhcpcd} /mnt/var/service
-cp -r /mnt/home/${user_name}/{voidrice,st,dwm} \
-	/mnt/home/${user_name}/.local/progs/