diff --git a/COPYING b/COPYING old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/base-x64.packages b/base-x64.packages old mode 100644 new mode 100755 index 9e8088f..ddbb890 --- a/base-x64.packages +++ b/base-x64.packages @@ -11,6 +11,9 @@ mdadm #USERLAND PACKAGES +exfat-utils +fuse-exfat +wget NetworkManager nano vim diff --git a/base-x64.sh b/base-x64.sh index 1974dd5..512e00a 100755 --- a/base-x64.sh +++ b/base-x64.sh @@ -2,46 +2,57 @@ echo "=========================" echo "| BASE VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current -#NONFREE=https://repo.voidlinux.eu/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree + FILENAME="void-live-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 +# Run mklive command with set architechure, repos and package list +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do -#: ${ARCH:=$(uname -m)} + ((retry++)) + if [[ $retry -eq 2 ]];then + break + fi -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -p "$(grep '^[^#].' base-x64.packages)" \ - -T "Void Linux Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' base-x64.packages)" \ + -T "${DESKTOP}" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso + +done - -if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 +# Make sure resulting ISO exists and sent error to webpage if not +if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 fi +# Add iso file to checksum list sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt - +# Check if checksum file exists, send error to webpage if not if [ ! -f sha256sums.txt ];then echo "Missing checksum file, aborting!" echo "ERR=1" > error-status.txt exit 1 fi +# make sure build directory exists and create it if not if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi +# Move the iso file to the build directory mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build diff --git a/build-images.sh b/build-images.sh index 9349a6f..e26fdb0 100755 --- a/build-images.sh +++ b/build-images.sh @@ -1,5 +1,5 @@ #!/bin/bash - +clear HTMLDIR="/var/www/voidbuilds.xyz/public" FILENAME="status.html" ISODIR="download" @@ -39,10 +39,10 @@ mvImages(){ cp cinnamon-x64.packages ${PKGLISTDIR}/cinnamon-x64.packages.txt cp e17-x64.packages ${PKGLISTDIR}/e17-x64.packages.txt cp mate-x64.packages ${PKGLISTDIR}/mate-x64.packages.txt - cp lxde-x64.packages ${PKGLISTDIR}/lxde-x64.packages.txt +# cp lxde-x64.packages ${PKGLISTDIR}/lxde-x64.packages.txt cp lxqt-x64.packages ${PKGLISTDIR}/lxqt-x64.packages.txt cp i3-x64.packages ${PKGLISTDIR}/i3-x64.packages.txt - #cp kde-x64.packages ${PKGLISTDIR}/kde-x64.packages.txt + cp kde-x64.packages ${PKGLISTDIR}/kde-x64.packages.txt #cp gnome-x64.packages ${PKGLISTDIR}/gnome-x64.packages.txt cp xfce-x64.packages ${PKGLISTDIR}/xfce-x64.packages.txt @@ -240,6 +240,7 @@ genSpecs(){ echo "AMDGPU Version: $(xbps-query -R xf86-video-amdgpu| grep pkgver | sed 's/pkgver://')

" >> ${HTMLDIR}/${FILENAME} echo "" >> ${HTMLDIR}/${FILENAME} } + genHtml(){ FILENAME="status.html" @@ -333,6 +334,9 @@ case ${1} in done ;; +-c|-clean) + cleanUp +;; *) echo -e "\nusage: ${0} [-bn, -bl]\n" diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in old mode 100644 new mode 100755 diff --git a/cinnamon-x64.packages b/cinnamon-x64.packages old mode 100644 new mode 100755 index e64f940..c80b0ae --- a/cinnamon-x64.packages +++ b/cinnamon-x64.packages @@ -12,7 +12,7 @@ mdadm xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode +#intel-ucode setxkbmap xauth font-misc-misc @@ -22,8 +22,11 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm -pm-utils nano xdg-utils xdg-desktop-portal @@ -44,7 +47,7 @@ vim dtrx unzip p7zip -unrar +#unrar bash-completion cinnamon xrandr @@ -68,3 +71,4 @@ ntfs-3g gnome-keyring network-manager-applet firefox +papirus-icon-theme diff --git a/cinnamon-x64.sh b/cinnamon-x64.sh index 3fead19..74494dd 100755 --- a/cinnamon-x64.sh +++ b/cinnamon-x64.sh @@ -3,31 +3,45 @@ DESKTOP="cinnamon" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 -#: ${ARCH:=$(uname -m)} +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -r ${NONFREE} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi + + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/data/issue b/data/issue old mode 100644 new mode 100755 diff --git a/data/splash.png b/data/splash.png old mode 100644 new mode 100755 index 639d2ef..e7337e6 Binary files a/data/splash.png and b/data/splash.png differ diff --git a/data/void-vpkgs.conf b/data/void-vpkgs.conf old mode 100644 new mode 100755 diff --git a/dracut/autoinstaller/autoinstall.cfg b/dracut/autoinstaller/autoinstall.cfg old mode 100644 new mode 100755 diff --git a/dracut/autoinstaller/module-setup.sh b/dracut/autoinstaller/module-setup.sh old mode 100644 new mode 100755 diff --git a/dracut/netmenu/module-setup.sh b/dracut/netmenu/module-setup.sh old mode 100644 new mode 100755 diff --git a/dracut/vmklive/59-mtd.rules b/dracut/vmklive/59-mtd.rules old mode 100644 new mode 100755 diff --git a/dracut/vmklive/61-mtd.rules b/dracut/vmklive/61-mtd.rules old mode 100644 new mode 100755 diff --git a/dracut/vmklive/adduser.sh b/dracut/vmklive/adduser.sh old mode 100644 new mode 100755 diff --git a/dracut/vmklive/display-manager-autologin.sh b/dracut/vmklive/display-manager-autologin.sh old mode 100644 new mode 100755 diff --git a/dracut/vmklive/locale.sh b/dracut/vmklive/locale.sh old mode 100644 new mode 100755 diff --git a/dracut/vmklive/module-setup.sh b/dracut/vmklive/module-setup.sh old mode 100644 new mode 100755 diff --git a/dracut/vmklive/services.sh b/dracut/vmklive/services.sh old mode 100644 new mode 100755 diff --git a/e17-x64.packages b/e17-x64.packages old mode 100644 new mode 100755 index 19bc20e..2f5bccf --- a/e17-x64.packages +++ b/e17-x64.packages @@ -13,7 +13,6 @@ xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -23,6 +22,10 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm enlightenment terminology @@ -44,7 +47,6 @@ upower flatpak zenity bash-completion -pm-utils nano xdg-utils vim @@ -56,6 +58,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp void-repo-multilib @@ -70,6 +74,5 @@ ntfs-3g gnome-keyring network-manager-applet firefox -Adapta papirus-icon-theme gnome-themes-standard diff --git a/gnome-x64.packages b/gnome-x64.packages old mode 100644 new mode 100755 index e8a01fc..5ac4e97 --- a/gnome-x64.packages +++ b/gnome-x64.packages @@ -27,8 +27,11 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget gdm -pm-utils bash-completion nano git diff --git a/gnome-x64.sh b/gnome-x64.sh index 390a2fe..9c52cb4 100755 --- a/gnome-x64.sh +++ b/gnome-x64.sh @@ -3,30 +3,42 @@ DESKTOP="gnome" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -#NONFREE=https://repo.voidlinux.eu/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +#NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) - -#: ${ARCH:=$(uname -m)} - -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +retry=0 +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/grub/grub.cfg b/grub/grub.cfg old mode 100644 new mode 100755 diff --git a/grub/grub_void.cfg.in b/grub/grub_void.cfg.in old mode 100644 new mode 100755 diff --git a/hooks/README.md b/hooks/README.md old mode 100644 new mode 100755 diff --git a/i3-x64.packages b/i3-x64.packages old mode 100644 new mode 100755 index 90f99b9..bdc12c2 --- a/i3-x64.packages +++ b/i3-x64.packages @@ -9,10 +9,12 @@ lvm2 mdadm # X PACKAGES +elogind +exfat-utils +fuse-exfat xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode setxkbmap xauth xrandr @@ -23,8 +25,8 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +wget lxdm -pm-utils nano xdg-utils xdg-desktop-portal @@ -54,6 +56,8 @@ xterm mc htop tuxc +dtrx +p7zip topgrade ntp dmenu diff --git a/i3-x64.sh b/i3-x64.sh index bbb273a..65d6a7d 100755 --- a/i3-x64.sh +++ b/i3-x64.sh @@ -3,31 +3,44 @@ DESKTOP="i3" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 -#: ${ARCH:=$(uname -m)} +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -r ${NONFREE} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/image_contents/base-x64.packages.txt b/image_contents/base-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/cinnamon-x64.packages.txt b/image_contents/cinnamon-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/i3-x64.packages.txt b/image_contents/i3-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/lxde-x64.packages.txt b/image_contents/lxde-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/lxqt-x64.packages.txt b/image_contents/lxqt-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/mate-x64.packages.txt b/image_contents/mate-x64.packages.txt old mode 100644 new mode 100755 diff --git a/image_contents/xfce-x64.packages.txt b/image_contents/xfce-x64.packages.txt old mode 100644 new mode 100755 diff --git a/installer.sh.in b/installer.sh.in old mode 100644 new mode 100755 diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in old mode 100644 new mode 100755 diff --git a/kde-x64.packages b/kde-x64.packages old mode 100644 new mode 100755 index 61b2edc..41c7abd --- a/kde-x64.packages +++ b/kde-x64.packages @@ -22,10 +22,12 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat sddm konsole bash-completion -pm-utils nano git vim @@ -52,11 +54,12 @@ inetutils usbutils wget curl +dtrx +p7zip xterm htop tuxc topgrade -keepassxc octoxbps ntp void-repo-multilib @@ -78,4 +81,4 @@ kaccounts-integration kaccounts-providers dolphin adapta-kde -papirus-icon-theme +adwaita-icon-theme diff --git a/kde-x64.sh b/kde-x64.sh index 5222ba7..8483484 100755 --- a/kde-x64.sh +++ b/kde-x64.sh @@ -3,9 +3,9 @@ DESKTOP="kde" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -#NONFREE=https://repo.voidlinux.eu/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -15,18 +15,36 @@ BUILDDIR="$(pwd)/build" #: ${ARCH:=$(uname -m)} -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +retry=0 + +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi + + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist b/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist old mode 100644 new mode 100755 diff --git a/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist b/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist old mode 100644 new mode 100755 diff --git a/lib.sh.in b/lib.sh.in old mode 100644 new mode 100755 diff --git a/lxde-x64.packages b/lxde-x64.packages old mode 100644 new mode 100755 index 91fd83d..3d12201 --- a/lxde-x64.packages +++ b/lxde-x64.packages @@ -24,6 +24,10 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm pm-utils bash-completion diff --git a/lxde-x64.sh b/lxde-x64.sh index 2f2fe25..2505354 100755 --- a/lxde-x64.sh +++ b/lxde-x64.sh @@ -18,16 +18,25 @@ BUILDDIR="$(pwd)/build" sudo ./mklive.sh \ -a x86_64 \ -r ${CURRENT} \ - -r ${MUTILIB} \ +# -r ${MUTILIB} \ -r ${NONFREE} \ -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ -T "Void Linux ${DESKTOP} Unofficial" \ -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/lxqt-x64.packages b/lxqt-x64.packages old mode 100644 new mode 100755 index 6bf1977..85e1cb2 --- a/lxqt-x64.packages +++ b/lxqt-x64.packages @@ -7,14 +7,12 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -24,8 +22,11 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget qt5-plugin-sqlite -pm-utils nano bash-completion git @@ -52,6 +53,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp octoxbps @@ -65,3 +68,4 @@ ntfs-3g gnome-keyring network-manager-applet falkon +papirus-icon-theme diff --git a/lxqt-x64.sh b/lxqt-x64.sh index dde3390..25f8e4b 100755 --- a/lxqt-x64.sh +++ b/lxqt-x64.sh @@ -3,32 +3,44 @@ DESKTOP="lxqt" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 -#: ${ARCH:=$(uname -m)} - -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -r ${NONFREE} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry - gt 2 ]];then + break + fi + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/mate-x64.packages b/mate-x64.packages old mode 100644 new mode 100755 index 8d0511c..0b2e327 --- a/mate-x64.packages +++ b/mate-x64.packages @@ -7,13 +7,11 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode setxkbmap xauth xrandr @@ -24,6 +22,10 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm mate mate-extra @@ -49,6 +51,8 @@ alsa-plugins-pulseaudio xterm htop tuxc +dtrx +p7zip topgrade ntp octoxbps @@ -62,3 +66,4 @@ ntfs-3g gnome-keyring network-manager-applet firefox +papirus-icon-theme diff --git a/mate-x64.sh b/mate-x64.sh index 1611b20..03ebcab 100755 --- a/mate-x64.sh +++ b/mate-x64.sh @@ -11,24 +11,36 @@ DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 -#: ${ARCH:=$(uname -m)} - - ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -r ${NONFREE} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt diff --git a/mkimage.sh.in b/mkimage.sh.in old mode 100644 new mode 100755 diff --git a/mklive.sh.in b/mklive.sh.in old mode 100644 new mode 100755 diff --git a/mknet.sh.in b/mknet.sh.in old mode 100644 new mode 100755 diff --git a/mkplatformfs.sh.in b/mkplatformfs.sh.in old mode 100644 new mode 100755 diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in old mode 100644 new mode 100755 diff --git a/package_lists/base-x64.packages.txt b/package_lists/base-x64.packages.txt old mode 100644 new mode 100755 index 9f7e7af..ddbb890 --- a/package_lists/base-x64.packages.txt +++ b/package_lists/base-x64.packages.txt @@ -6,12 +6,14 @@ grub-x86_64-efi dialog cryptsetup lvm2 -mdadm -ConsoleKit2 +mdadm #USERLAND PACKAGES +exfat-utils +fuse-exfat +wget NetworkManager nano vim diff --git a/package_lists/cinnamon-x64.packages.txt b/package_lists/cinnamon-x64.packages.txt old mode 100644 new mode 100755 index eccbb4d..c80b0ae --- a/package_lists/cinnamon-x64.packages.txt +++ b/package_lists/cinnamon-x64.packages.txt @@ -6,14 +6,13 @@ grub-x86_64-efi dialog cryptsetup lvm2 -mdadm -ConsoleKit2 +mdadm # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode +#intel-ucode setxkbmap xauth font-misc-misc @@ -23,16 +22,32 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm -pm-utils nano xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak git vim dtrx unzip p7zip -unrar +#unrar bash-completion cinnamon xrandr @@ -56,3 +71,4 @@ ntfs-3g gnome-keyring network-manager-applet firefox +papirus-icon-theme diff --git a/package_lists/e17-x64.packages.txt b/package_lists/e17-x64.packages.txt old mode 100644 new mode 100755 index e922c72..2f5bccf --- a/package_lists/e17-x64.packages.txt +++ b/package_lists/e17-x64.packages.txt @@ -7,14 +7,12 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -24,14 +22,31 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm enlightenment terminology econnman +upower xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak zenity bash-completion -pm-utils nano xdg-utils vim @@ -43,6 +58,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp void-repo-multilib @@ -57,6 +74,5 @@ ntfs-3g gnome-keyring network-manager-applet firefox -Adapta papirus-icon-theme gnome-themes-standard diff --git a/package_lists/i3-x64.packages.txt b/package_lists/i3-x64.packages.txt old mode 100644 new mode 100755 index 68f473d..bdc12c2 --- a/package_lists/i3-x64.packages.txt +++ b/package_lists/i3-x64.packages.txt @@ -7,13 +7,14 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES +elogind +exfat-utils +fuse-exfat xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode setxkbmap xauth xrandr @@ -24,12 +25,26 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +wget lxdm -pm-utils nano xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak git vim +upower bash-completion i3-gaps i3blocks @@ -41,6 +56,8 @@ xterm mc htop tuxc +dtrx +p7zip topgrade ntp dmenu diff --git a/package_lists/kde-x64.packages.txt b/package_lists/kde-x64.packages.txt new file mode 100755 index 0000000..41c7abd --- /dev/null +++ b/package_lists/kde-x64.packages.txt @@ -0,0 +1,84 @@ +#GRUB +grub-i386-efi +grub-x86_64-efi + +#BASE PKGS +dialog +cryptsetup +lvm2 +mdadm + +# X PACKAGES +xorg +xorg-input-drivers +xorg-video-drivers +setxkbmap +xauth +xrandr +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +sddm +konsole +bash-completion +nano +git +vim +xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak +alsa-utils +alsa-plugins-pulseaudio +plasma-pa +paprefs +pavucontrol +inetutils +usbutils +wget +curl +dtrx +p7zip +xterm +htop +tuxc +topgrade +octoxbps +ntp +void-repo-multilib +void-repo-nonfree +octoxbps +kdesu +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +NetworkManager +plasma-nm +firefox +kde5 +kde5-baseapps +kaccounts-integration +kaccounts-providers +dolphin +adapta-kde +adwaita-icon-theme diff --git a/package_lists/lxde-x64.packages.txt b/package_lists/lxde-x64.packages.txt deleted file mode 100644 index 301ebfc..0000000 --- a/package_lists/lxde-x64.packages.txt +++ /dev/null @@ -1,53 +0,0 @@ -#GRUB -grub-i386-efi -grub-x86_64-efi - -#BASE PKGS -dialog -cryptsetup -lvm2 -mdadm -ConsoleKit2 - -# X PACKAGES -xorg-minimal -xorg-input-drivers -xorg-video-drivers -intel-ucode -setxkbmap -xrandr -xauth -font-misc-misc -terminus-font -dejavu-fonts-ttf -alsa-plugins-pulseaudio - - -#USERLAND PACKAGES -lxdm -pm-utils -bash-completion -nano -git -vim -lxde -xdg-utils -gnome-terminal -alsa-utils -pavucontrol -xterm -htop -tuxc -topgrade -ntp -octoxbps -gksu -void-repo-multilib -gvfs-afc -gvfs-mtp -gvfs-smb -udisks2 -ntfs-3g -gnome-keyring -network-manager-applet -falkon diff --git a/package_lists/lxqt-x64.packages.txt b/package_lists/lxqt-x64.packages.txt old mode 100644 new mode 100755 index ac79f17..85e1cb2 --- a/package_lists/lxqt-x64.packages.txt +++ b/package_lists/lxqt-x64.packages.txt @@ -7,14 +7,12 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -24,12 +22,28 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget qt5-plugin-sqlite -pm-utils nano bash-completion git xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak vim lxdm lxqt @@ -39,6 +53,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp octoxbps @@ -52,3 +68,4 @@ ntfs-3g gnome-keyring network-manager-applet falkon +papirus-icon-theme diff --git a/package_lists/mate-x64.packages.txt b/package_lists/mate-x64.packages.txt old mode 100644 new mode 100755 index ab638bd..0b2e327 --- a/package_lists/mate-x64.packages.txt +++ b/package_lists/mate-x64.packages.txt @@ -7,13 +7,11 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers -intel-ucode setxkbmap xauth xrandr @@ -24,6 +22,10 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +elogind +exfat-utils +fuse-exfat +wget lxdm mate mate-extra @@ -31,11 +33,26 @@ bash-completion caja-extensions alsa-utils xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak pavucontrol alsa-plugins-pulseaudio xterm htop tuxc +dtrx +p7zip topgrade ntp octoxbps @@ -49,3 +66,4 @@ ntfs-3g gnome-keyring network-manager-applet firefox +papirus-icon-theme diff --git a/package_lists/xfce-x64.packages.txt b/package_lists/xfce-x64.packages.txt old mode 100644 new mode 100755 index 84cb807..359a14f --- a/package_lists/xfce-x64.packages.txt +++ b/package_lists/xfce-x64.packages.txt @@ -7,14 +7,12 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -24,11 +22,27 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +exfat-utils +elogind +fuse-exfat +wget lxdm xdg-utils +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libvdpau-va-gl +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak zenity bash-completion -pm-utils nano xdg-utils vim @@ -40,6 +54,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp void-repo-multilib diff --git a/packer/http/autoinstall.cfg b/packer/http/autoinstall.cfg old mode 100644 new mode 100755 diff --git a/packer/scripts/vagrant.sh b/packer/scripts/vagrant.sh old mode 100644 new mode 100755 diff --git a/packer/templates/vagrant-glibc64.json b/packer/templates/vagrant-glibc64.json old mode 100644 new mode 100755 diff --git a/pxelinux.cfg/pxelinux.cfg.in b/pxelinux.cfg/pxelinux.cfg.in old mode 100644 new mode 100755 diff --git a/release.sh.in b/release.sh.in old mode 100644 new mode 100755 diff --git a/silvernode.asc b/silvernode.asc old mode 100644 new mode 100755 diff --git a/templates/logen/logen.packages b/templates/logen/logen.packages old mode 100644 new mode 100755 diff --git a/templates/plasma/plasma.packages b/templates/plasma/plasma.packages old mode 100644 new mode 100755 diff --git a/templates/plasma/splash.png b/templates/plasma/splash.png old mode 100644 new mode 100755 diff --git a/tom-x64.packages b/tom-x64.packages old mode 100644 new mode 100755 diff --git a/voidbuilds-logo.png b/voidbuilds-logo.png old mode 100644 new mode 100755 diff --git a/xfce-x64.packages b/xfce-x64.packages old mode 100644 new mode 100755 index b7ffbab..359a14f --- a/xfce-x64.packages +++ b/xfce-x64.packages @@ -7,14 +7,12 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal xorg-input-drivers xorg-video-drivers xrandr -intel-ucode setxkbmap xauth font-misc-misc @@ -24,6 +22,10 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES +exfat-utils +elogind +fuse-exfat +wget lxdm xdg-utils xdg-desktop-portal @@ -41,7 +43,6 @@ upower flatpak zenity bash-completion -pm-utils nano xdg-utils vim @@ -53,6 +54,8 @@ pavucontrol xterm htop tuxc +dtrx +p7zip topgrade ntp void-repo-multilib diff --git a/xfce-x64.sh b/xfce-x64.sh index 5ddb966..19e0f47 100755 --- a/xfce-x64.sh +++ b/xfce-x64.sh @@ -3,31 +3,44 @@ DESKTOP="xfce" echo "=========================" echo "| ${DESKTOP} VOID x86_64 |" echo " ------------------------" -CURRENT=https://alpha.de.repo.voidlinux.org/current -MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib -NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree +CURRENT=https://mirrors.servercentral.com/voidlinux/current +MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib +NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) BUILDDIR="$(pwd)/build" -#shift $((OPTIND - 1)) +retry=0 -#: ${ARCH:=$(uname -m)} +until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do + ((retry++)) + if [[ $retry -gt 2 ]];then + break + fi -sudo ./mklive.sh \ - -a x86_64 \ - -r ${CURRENT} \ - -r ${MUTILIB} \ - -r ${NONFREE} \ - -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ - -T "Void Linux ${DESKTOP} Unofficial" \ - -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso + sudo ./mklive.sh \ + -a x86_64 \ + -r "${CURRENT}" \ + -r "${MULTILIB}" \ + -p "$(grep '^[^#].' ${DESKTOP}-x64.packages)" \ + -T "Void Linux ${DESKTOP} Unofficial" \ + -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso +done if [ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];then - echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" - echo "ERR=1" > error-status.txt - exit 1 + retries=${1} + until [[ $retries -gt 2 ]];do + echo "Retrying build ${retries}" + ((retries++)) + bash ${0} ${retries} + + done + if [[ ! -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ]];then + echo "Error: ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso : does not exist! Aborting!" + echo "ERR=1" > error-status.txt + exit 1 + fi fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt