Like a year of changes, lazy, sorry

base-x64.packages

@@ -11,6 +11,9 @@ mdadm
 
 
 #USERLAND PACKAGES
+exfat-utils
+fuse-exfat
+wget
 NetworkManager
 nano
 vim

base-x64.sh

@@ -2,46 +2,57 @@
 echo "========================="
 echo "| BASE VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
         -p "$(grep '^[^#].' base-x64.packages)" \
-    -T "Void Linux Unofficial" \
+        -T "${DESKTOP}" \
         -o ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso
     
+done
 
+# 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

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://')</br></br>" >> ${HTMLDIR}/${FILENAME}
     echo "</html>" >> ${HTMLDIR}/${FILENAME}
 }
+
 genHtml(){
     FILENAME="status.html"
 
@@ -333,6 +334,9 @@ case ${1} in
     done
 ;;
 
+-c|-clean)
+    cleanUp
+;;
 
 *)
 	echo -e "\nusage: ${0} [-bn, -bl]\n"

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

cinnamon-x64.sh

@@ -3,32 +3,46 @@ DESKTOP="cinnamon"
 echo "========================="
 echo "| ${DESKTOP} VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -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
+    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
 

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

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

gnome-x64.sh

@@ -3,31 +3,43 @@ DESKTOP="gnome"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+#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
-
+until [ -f ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso ];do
-#: ${ARCH:=$(uname -m)}
+    ((retry++))
-
+    if [[ $retry -gt 2 ]];then
+        break
+    fi
     sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -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
+    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
 

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

i3-x64.sh

@@ -3,32 +3,45 @@ DESKTOP="i3"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -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
+    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
 

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

kde-x64.sh

@@ -3,9 +3,9 @@ DESKTOP="kde"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-#NONFREE=https://repo.voidlinux.eu/current/nonfree
+NONFREE=https://mirrors.servercentral.com/voidlinux/current/nonfree
 FILENAME="void-live-${DESKTOP}-unofficial"
 DATE=$(date +%Y%m%d)
 KERNEL=$(uname -r)
@@ -15,19 +15,37 @@ BUILDDIR="$(pwd)/build"
 
 #: ${ARCH:=$(uname -m)}
 
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -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
+    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
 

lxde-x64.packages

@@ -24,6 +24,10 @@ alsa-plugins-pulseaudio
 
 
 #USERLAND PACKAGES
+elogind
+exfat-utils
+fuse-exfat
+wget
 lxdm
 pm-utils
 bash-completion

lxde-x64.sh

@@ -18,17 +18,26 @@ 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
+    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
 

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

lxqt-x64.sh

@@ -3,33 +3,45 @@ DESKTOP="lxqt"
 echo "========================="
 echo "| ${DESKTOP} VOID x86_64    |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -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
+    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
 

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

mate-x64.sh

@@ -11,25 +11,37 @@ 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
 
-   ./mklive.sh \
+    sudo ./mklive.sh \
         -a x86_64 \
-    -r ${CURRENT} \
+        -r "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -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
+    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
 

package_lists/base-x64.packages.txt

@@ -7,11 +7,13 @@ dialog
 cryptsetup 
 lvm2 
 mdadm
-ConsoleKit2
 
 
 
 #USERLAND PACKAGES
+exfat-utils
+fuse-exfat
+wget
 NetworkManager
 nano
 vim

package_lists/cinnamon-x64.packages.txt

@@ -7,13 +7,12 @@ dialog
 cryptsetup 
 lvm2 
 mdadm
-ConsoleKit2
 
 # 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

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

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

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

package_lists/lxde-x64.packages.txt

@@ -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

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

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

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

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

xfce-x64.sh

@@ -3,32 +3,45 @@ DESKTOP="xfce"
 echo "========================="
 echo "|      ${DESKTOP} VOID x86_64     |"
 echo " ------------------------"
-CURRENT=https://alpha.de.repo.voidlinux.org/current
+CURRENT=https://mirrors.servercentral.com/voidlinux/current
-MUTILIB=https://alpha.de.repo.voidlinux.org/current/multilib
+MUTILIB=https://mirrors.servercentral.com/voidlinux/current/multilib
-NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree
+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 "${CURRENT}" \
-    -r ${MUTILIB} \
+        -r "${MULTILIB}" \
-    -r ${NONFREE} \
         -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
+    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