diff --git a/base-x64.packages b/base-x64.packages index 0c82dd2..9e8088f 100644 --- a/base-x64.packages +++ b/base-x64.packages @@ -6,8 +6,7 @@ grub-x86_64-efi dialog cryptsetup lvm2 -mdadm -ConsoleKit2 +mdadm @@ -20,6 +19,7 @@ git xterm htop tuxc +topgrade ntp void-repo-multilib ntfs-3g diff --git a/base-x64.sh b/base-x64.sh index 396ce1b..1974dd5 100755 --- a/base-x64.sh +++ b/base-x64.sh @@ -23,9 +23,23 @@ sudo ./mklive.sh \ -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 +fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt + + + +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi diff --git a/build-images.sh b/build-images.sh index c92f8f8..a086d42 100755 --- a/build-images.sh +++ b/build-images.sh @@ -1,82 +1,342 @@ #!/bin/bash HTMLDIR="/var/www/voidbuilds.xyz/public" -FILENAME="BUILD_STATUS.html" -TOTAL="7" +FILENAME="status.html" +ISODIR="download" -echo "0/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} +echo "checking for updates" +xbps-install -Syu && xbps-install -yu -echo "Building Image: Base
" >> ${HTMLDIR}/${FILENAME} -echo "Building: Base Image..." -sleep 1 -./base-x64.sh -echo "1/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} -echo "Building Image: Cinnamon
" >> ${HTMLDIR}/${FILENAME} -echo " Building: Cinnamon Image..." +mvImages(){ + PKGLISTDIR="package_lists" -sleep 1 -./cinnamon-x64.sh + if [ ! -f sha256sums.txt ];then + echo "checksum file not found, aborting!" + exit 1 + fi -echo "2/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + if [ -d "${HTMLDIR}" ];then + rm ${HTMLDIR}/${ISODIR}/*.iso + rm ${HTMLDIR}/${ISODIR}/*.txt + rm ${HTMLDIR}/${ISODIR}/*.sig + mv sha256sums.txt build + mv sha256sums.txt.sig build + mv build/* ${HTMLDIR}/${ISODIR} + else + echo "${HTMLDIR}/${ISODIR} does not exist" + fi -#echo "Building Image: GNOME
" >> ${HTMLDIR}/${FILENAME} -#echo " Building: Gnome Image..." -#sleep 1 -#./gnome-x64.sh + if [ ! -d "${PKGLISTDIR}" ];then + mkdir "${PKGLISTDIR}" + fi -echo "Building Image: i3
" >> ${HTMLDIR}/${FILENAME} -echo "Building: i3 image..." -sleep 1 -./i3-x64.sh + rm ${PKGLISTDIR}/* + cp base-x64.packages ${PKGLISTDIR}/base-x64.packages.txt + 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 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 gnome-x64.packages ${PKGLISTDIR}/gnome-x64.packages.txt + cp xfce-x64.packages ${PKGLISTDIR}/xfce-x64.packages.txt -echo "3/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + cp -r ${PKGLISTDIR} ${HTMLDIR} -#echo "Building Image: KDE
" >> ${HTMLDIR}/${FILENAME} -#echo "Building: Kde image..." -#sleep 1 -#./kde-x64.sh + return +} -echo "Building Image: LXDE
" >> ${HTMLDIR}/${FILENAME} -echo "Building: Lxde Image..." -sleep 1 -./lxde-x64.sh +runBuilds(){ + TOTAL="8" + ERR_FILE="error-status.txt" -echo "4/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + if [ -f "${ERR_FILE}" ];then + echo "removing error file" + rm ${ERR_FILE} + fi -echo "Building Image: LXQT
" >> ${HTMLDIR}/${FILENAME} -echo "Building: Lxqt Image..." -sleep 1 -./lxqt-x64.sh + if [ ! -z "$(ls -A build)" ];then + rm build/* + fi -echo "5/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + echo "0/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} -echo "Building Image: MATE
" >> ${HTMLDIR}/${FILENAME} -echo "Building: Mate Image..." -sleep 1 -./mate-x64.sh + echo "Building Image: Base
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Base Image..." -echo "6/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + sleep 1 + ./base-x64.sh -echo "Building Image: XFCE
" >> ${HTMLDIR}/${FILENAME} -echo "Building: Xfce Image..." -sleep 1 -./xfce-x64.sh + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'base', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "1/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi -echo "7/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + echo "Building Image: Cinnamon
" >> ${HTMLDIR}/${FILENAME} + echo " Building: Cinnamon Image..." + + sleep 1 + ./cinnamon-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'Cinnamon', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "2/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + #echo "Building Image: GNOME
" >> ${HTMLDIR}/${FILENAME} + #echo " Building: Gnome Image..." + #sleep 1 + #./gnome-x64.sh + + echo "Building Image: i3
" >> ${HTMLDIR}/${FILENAME} + echo "Building: i3 image..." + + sleep 1 + ./i3-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'i3', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "3/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: Enlightenment
" >> ${HTMLDIR}/${FILENAME} + echo "Building: enlightenment image..." + + sleep 1 + ./e17-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'i3', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "4/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: KDE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Kde image..." + sleep 1 + ./kde-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'KDE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "5/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + #echo "Building Image: LXDE
" >> ${HTMLDIR}/${FILENAME} + #echo "Building: Lxde Image..." + #sleep 1 + #./lxde-x64.sh + + #if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + # echo "Build failed for image: 'LXDE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + # rm ${ERR_FILE} + # ${0} -bl + #else + # echo "6/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + #fi + + echo "Building Image: LXQT
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Lxqt Image..." + sleep 1 + ./lxqt-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'LXQT', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "6/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: MATE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Mate Image..." + sleep 1 + ./mate-x64.sh + + if [ "$(cat ${ERR_FILE})" = "ERR=1" ];then + echo "Build failed for image: 'MATE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "7/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: XFCE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Xfce Image..." + sleep 1 + ./xfce-x64.sh + + if [ "$(cat ${ERR_FILE})" = "ERR=1" ];then + echo "Build failed for image: 'XFCE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "8/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + if [ ! -f sha256sums.txt ];then + echo "sha manifest does not exist!" + else + echo "Signing checksum file
" >> ${HTMLDIR}/${FILENAME} + ./sign-file.sh -f sha256sums.txt + mvImages + fi + + -if [ ! -f sha256sums.txt ];then - echo "sha manifest does not exist!" echo "Done!" - exit 0; -fi - -echo "Signing checksum file
" >> ${HTMLDIR}/${FILENAME} -./sign-file.sh -f sha256sums.txt -./mv-images.sh + return +} -echo "Done!" +genSpecs(){ + HTMLDIR="/var/www/voidbuilds.xyz/public" + FILENAME="specs.html" + + echo "" > ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo '' >> ${HTMLDIR}/${FILENAME} + echo '

System Specs

' >> ${HTMLDIR}/${FILENAME} + echo "CPU Cores: 1
" >> ${HTMLDIR}/${FILENAME} + echo "Disk Size: $(df -h| tr -s ' ' $'\t' | grep vda1 | cut -f2)
" >> ${HTMLDIR}/${FILENAME} + echo "Disk Space Used: $(df | tr -s ' ' $'\t' | grep vda1 | cut -f5)
" >> ${HTMLDIR}/${FILENAME} + echo "Memory Size: $(free -m| tr -s ' ' $'\t' | grep Mem: | cut -f2) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Memory Free: $(free -m| tr -s ' ' $'\t' | grep Mem: | cut -f4) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Swap Size: $(free -m| tr -s ' ' $'\t' | grep Swap: | cut -f2) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Swap Used: $(free -m| tr -s ' ' $'\t' | grep Swap: | cut -f3) Mb

" >> ${HTMLDIR}/${FILENAME} + + echo "

Live Image Specs

" >> ${HTMLDIR}/${FILENAME} + echo "
System
" + echo "Kernel Version: $(xbps-query -R linux| grep pkgver | sed 's/pkgver://') series
" >> ${HTMLDIR}/${FILENAME} + echo "GlibC Version: $(xbps-query -R glibc| grep pkgver | sed 's/pkgver://')

" >> ${HTMLDIR}/${FILENAME} + echo "AMDGPU Version: $(xbps-query -R xf86-video-amdgpu| grep pkgver | sed 's/pkgver://')

" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} +} +genHtml(){ + FILENAME="status.html" + + + + echo "" > ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo '" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + echo '' >> ${HTMLDIR}/${FILENAME} + echo "
This page will refresh every 10 seconds

" >> ${HTMLDIR}/${FILENAME} + + + echo "

Build process initiated at:

$(date +%R) MST ($(date -u +%R) UTC) on $(date +%D)" >> ${HTMLDIR}/${FILENAME} + echo "

ETA: 2 hours from initiation time


" >> ${HTMLDIR}/${FILENAME} + + + echo "
" >> ${HTMLDIR}/${FILENAME} + + #cat ${HTMLDIR}/${FILENAME} + + echo "

Status

" >> ${HTMLDIR}/${FILENAME} + + runBuilds + + echo "Disk Space Used: $(df | tr -s ' ' $'\t' | grep vda1 | cut -f5)
" >> ${HTMLDIR}/${FILENAME} + echo "All images were completed at $(date +%R) MST ($(date -u +%R) UTC)
" >> ${HTMLDIR}/${FILENAME} + echo "Next build round in 24 hours" >> ${HTMLDIR}/${FILENAME} + echo 'Return to landing page' >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + + return +} + +cleanUp(){ + + + BUILDDIR="build" + echo "[Cleaning up...]" + echo "Checking for local XBPS cache dir..." + if [ -d xbps-cachedir-x86_64 ];then + echo "Removing local XBPS cache dir" + rm -r xbps-cachedir-x86_64/ + fi + echo "Removing orphans..." + xbps-remove -yo + echo "Clearing system XBPS cache files..." + tux c + echo "Checking for unused image files..." + if [ "$(ls -A $BUILDDIR)" ];then + echo "Removing unused image files.." + rm build/* + fi + + echo "Checking for and removing unused kernels..." + vkpurge rm all + +} + +case ${1} in + + +-bl|--build-later) + while true;do + snooze -v && cleanUp && genSpecs && genHtml && cleanUp && genSpecs + done +;; + +-bn|--build-now) + while true;do + cleanUp && genSpecs && genHtml && cleanUp && genSpecs && snooze -v + done +;; + + +*) + echo -e "\nusage: ${0} [-bn, -bl]\n" + echo -e "\n-bn run builds now, snooze after\n" + echo -e "-bl snooze now, run builds after\n\n" +;; +esac diff --git a/build-images.sh.bak b/build-images.sh.bak new file mode 100755 index 0000000..c4b5e24 --- /dev/null +++ b/build-images.sh.bak @@ -0,0 +1,346 @@ +#!/bin/bash + +HTMLDIR="/var/www/voidbuilds.xyz/public" +FILENAME="status.html" +ISODIR="download" + + +echo "checking for updates" +xbps-install -Syu && xbps-install -yu + + + + +mvImages(){ + PKGLISTDIR="package_lists" + + if [ ! -f sha256sums.txt ];then + echo "checksum file not found, aborting!" + exit 1 + fi + + if [ -d "${HTMLDIR}" ];then + rm ${HTMLDIR}/${ISODIR}/*.iso + rm ${HTMLDIR}/${ISODIR}/*.txt + rm ${HTMLDIR}/${ISODIR}/*.sig + mv sha256sums.txt build + mv sha256sums.txt.sig build + mv build/* ${HTMLDIR}/${ISODIR} + else + echo "${HTMLDIR}/${ISODIR} does not exist" + fi + + if [ ! -d "${PKGLISTDIR}" ];then + mkdir "${PKGLISTDIR}" + fi + + rm ${PKGLISTDIR}/* + cp base-x64.packages ${PKGLISTDIR}/base-x64.packages.txt + 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 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 gnome-x64.packages ${PKGLISTDIR}/gnome-x64.packages.txt + cp xfce-x64.packages ${PKGLISTDIR}/xfce-x64.packages.txt + + cp -r ${PKGLISTDIR} ${HTMLDIR} + + return +} + +runBuilds(){ + TOTAL="8" + ERR_FILE="error-status.txt" + + if [ -f "${ERR_FILE}" ];then + echo "removing error file" + rm ${ERR_FILE} + fi + + if [ ! -z "$(ls -A build)" ];then + rm build/* + fi + + echo "0/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + + echo "Building Image: Base
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Base Image..." + + sleep 1 + ./base-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'base', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "1/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: Cinnamon
" >> ${HTMLDIR}/${FILENAME} + echo " Building: Cinnamon Image..." + + sleep 1 + ./cinnamon-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'Cinnamon', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "2/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + #echo "Building Image: GNOME
" >> ${HTMLDIR}/${FILENAME} + #echo " Building: Gnome Image..." + #sleep 1 + #./gnome-x64.sh + + echo "Building Image: i3
" >> ${HTMLDIR}/${FILENAME} + echo "Building: i3 image..." + + sleep 1 + ./i3-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'i3', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "3/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: Enlightenment
" >> ${HTMLDIR}/${FILENAME} + echo "Building: enlightenment image..." + + sleep 1 + ./e17-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'i3', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "4/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: KDE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Kde image..." + sleep 1 + ./kde-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'KDE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "5/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: LXDE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Lxde Image..." + sleep 1 + ./lxde-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'LXDE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "6/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: LXQT
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Lxqt Image..." + sleep 1 + ./lxqt-x64.sh + + if [ $(cat ${ERR_FILE}) = "ERR=1" ];then + echo "Build failed for image: 'LXQT', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "7/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: MATE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Mate Image..." + sleep 1 + ./mate-x64.sh + + if [ "$(cat ${ERR_FILE})" = "ERR=1" ];then + echo "Build failed for image: 'MATE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "8/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + echo "Building Image: XFCE
" >> ${HTMLDIR}/${FILENAME} + echo "Building: Xfce Image..." + sleep 1 + ./xfce-x64.sh + + if [ "$(cat ${ERR_FILE})" = "ERR=1" ];then + echo "Build failed for image: 'XFCE', trying again at 00:00 MST
" >> ${HTMLDIR}/${FILENAME} + rm ${ERR_FILE} + ${0} -bl + else + echo "9/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + + if [ ! -f sha256sums.txt ];then + echo "sha manifest does not exist!" + else + echo "Signing checksum file
" >> ${HTMLDIR}/${FILENAME} + ./sign-file.sh -f sha256sums.txt + mvImages + fi + + + + echo "Done!" + return +} + + +genSpecs(){ + HTMLDIR="/var/www/voidbuilds.xyz/public" + FILENAME="specs.html" + + echo "" > ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo '' >> ${HTMLDIR}/${FILENAME} + echo '

System Specs

' >> ${HTMLDIR}/${FILENAME} + echo "CPU Cores: 1
" >> ${HTMLDIR}/${FILENAME} + echo "Disk Size: $(df -h| tr -s ' ' $'\t' | grep vda1 | cut -f2)
" >> ${HTMLDIR}/${FILENAME} + echo "Disk Space Used: $(df | tr -s ' ' $'\t' | grep vda1 | cut -f5)
" >> ${HTMLDIR}/${FILENAME} + echo "Memory Size: $(free -m| tr -s ' ' $'\t' | grep Mem: | cut -f2) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Memory Free: $(free -m| tr -s ' ' $'\t' | grep Mem: | cut -f4) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Swap Size: $(free -m| tr -s ' ' $'\t' | grep Swap: | cut -f2) Mb
" >> ${HTMLDIR}/${FILENAME} + echo "Swap Used: $(free -m| tr -s ' ' $'\t' | grep Swap: | cut -f3) Mb

" >> ${HTMLDIR}/${FILENAME} + + echo "

Live Image Specs

" >> ${HTMLDIR}/${FILENAME} + echo "
System
" + echo "Kernel Version: $(xbps-query -R linux| grep pkgver | sed 's/pkgver://') series
" >> ${HTMLDIR}/${FILENAME} + echo "GlibC Version: $(xbps-query -R glibc| grep pkgver | sed 's/pkgver://')

" >> ${HTMLDIR}/${FILENAME} + echo "AMDGPU Version: $(xbps-query -R xf86-video-amdgpu| grep pkgver | sed 's/pkgver://')

" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} +} +genHtml(){ + FILENAME="status.html" + + + + echo "" > ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo '" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + + echo "" >> ${HTMLDIR}/${FILENAME} + echo '' >> ${HTMLDIR}/${FILENAME} + echo "
This page will refresh every 10 seconds

" >> ${HTMLDIR}/${FILENAME} + + + echo "

Build process initiated at:

$(date +%R) MST ($(date -u +%R) UTC) on $(date +%D)" >> ${HTMLDIR}/${FILENAME} + echo "

ETA: 2 hours from initiation time


" >> ${HTMLDIR}/${FILENAME} + + + echo "
" >> ${HTMLDIR}/${FILENAME} + + #cat ${HTMLDIR}/${FILENAME} + + echo "

Status

" >> ${HTMLDIR}/${FILENAME} + + runBuilds + + echo "Disk Space Used: $(df | tr -s ' ' $'\t' | grep vda1 | cut -f5)
" >> ${HTMLDIR}/${FILENAME} + echo "All images were completed at $(date +%R) MST ($(date -u +%R) UTC)
" >> ${HTMLDIR}/${FILENAME} + echo "Next build round in 24 hours" >> ${HTMLDIR}/${FILENAME} + echo 'Return to landing page' >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + echo "" >> ${HTMLDIR}/${FILENAME} + + return +} + +cleanUp(){ + + if [ $(df | tr -s ' ' $'\t' | grep vda1 | cut -f5) > "42%" ];then + + BUILDDIR="build" + echo "[Cleaning up...]" + echo "Checking for local XBPS cache dir..." + if [ -d xbps-cachedir-x86_64 ];then + echo "Removing local XBPS cache dir" + rm -r xbps-cachedir-x86_64/ + fi + echo "Removing orphans..." + xbps-remove -yo + echo "Clearing system XBPS cache files..." + tux c + echo "Checking for unused image files..." + if [ "$(ls -A $BUILDDIR)" ];then + echo "Removing unused image files.." + rm build/* + fi + + echo "Checking for and removing unused kernels..." + vkpurge rm all + + else + return 0 + fi +} + +case ${1} in + + +-bl|--build-later) + while true;do + snooze -v && cleanUp && genSpecs && genHtml && cleanUp && genSpecs + done +;; + +-bn|--build-now) + while true;do + cleanUp && genSpecs && genHtml && cleanUp && genSpecs && snooze -v + done +;; + + +*) + echo -e "\nusage: ${0} [-bn, -bl]\n" + echo -e "\n-bn run builds now, snooze after\n" + echo -e "-bl snooze now, run builds after\n\n" +;; +esac diff --git a/cinnamon-x64.packages b/cinnamon-x64.packages index e167cf6..e64f940 100644 --- a/cinnamon-x64.packages +++ b/cinnamon-x64.packages @@ -6,8 +6,7 @@ grub-x86_64-efi dialog cryptsetup lvm2 -mdadm -ConsoleKit2 +mdadm # X PACKAGES xorg-minimal @@ -27,8 +26,25 @@ 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 bash-completion cinnamon xrandr @@ -39,6 +55,7 @@ pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/cinnamon-x64.sh b/cinnamon-x64.sh index 7ff921a..3fead19 100755 --- a/cinnamon-x64.sh +++ b/cinnamon-x64.sh @@ -5,7 +5,7 @@ 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 +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -19,14 +19,25 @@ 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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi diff --git a/e17-x64.packages b/e17-x64.packages new file mode 100644 index 0000000..19bc20e --- /dev/null +++ b/e17-x64.packages @@ -0,0 +1,75 @@ +#GRUB +grub-i386-efi +grub-x86_64-efi + +#BASE PKGS +dialog +cryptsetup +lvm2 +mdadm + +# X PACKAGES +xorg-minimal +xorg-input-drivers +xorg-video-drivers +xrandr +intel-ucode +setxkbmap +xauth +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +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 +git +alsa-utils +paprefs +pasystray +pavucontrol +xterm +htop +tuxc +topgrade +ntp +void-repo-multilib +void-repo-nonfree +octoxbps +gksu +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +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 index c7a0a23..e8a01fc 100644 --- a/gnome-x64.packages +++ b/gnome-x64.packages @@ -7,7 +7,6 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 dbus avahi avahi-utils @@ -37,11 +36,24 @@ vim alsa-utils paprefs xdg-utils -pasystray +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +libappindicator +AppStream +libva-vdpau-driver +vdpauinfo +pipewire +gstreamer1-pipewire +upower +flatpak pavucontrol xterm htop tuxc +topgrade ntp void-repo-multilib void-repo-nonfree diff --git a/gnome-x64.sh b/gnome-x64.sh index 37ad66c..390a2fe 100755 --- a/gnome-x64.sh +++ b/gnome-x64.sh @@ -23,12 +23,22 @@ sudo ./mklive.sh \ -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 +fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi -mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build \ No newline at end of file +mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build diff --git a/i3-x64.packages b/i3-x64.packages index d23f5ad..90f99b9 100644 --- a/i3-x64.packages +++ b/i3-x64.packages @@ -7,7 +7,6 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg-minimal @@ -28,8 +27,22 @@ 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 +54,7 @@ xterm mc htop tuxc +topgrade ntp dmenu sakura diff --git a/i3-x64.sh b/i3-x64.sh index 2e9419a..bbb273a 100755 --- a/i3-x64.sh +++ b/i3-x64.sh @@ -5,7 +5,7 @@ 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 +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -19,14 +19,25 @@ 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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi diff --git a/image_contents/base-x64.packages.txt b/image_contents/base-x64.packages.txt new file mode 100644 index 0000000..0c82dd2 --- /dev/null +++ b/image_contents/base-x64.packages.txt @@ -0,0 +1,25 @@ +#GRUB +grub-i386-efi +grub-x86_64-efi + +#BASE PKGS +dialog +cryptsetup +lvm2 +mdadm +ConsoleKit2 + + + +#USERLAND PACKAGES +NetworkManager +nano +vim +bash-completion +git +xterm +htop +tuxc +ntp +void-repo-multilib +ntfs-3g diff --git a/image_contents/cinnamon-x64.packages.txt b/image_contents/cinnamon-x64.packages.txt new file mode 100644 index 0000000..e167cf6 --- /dev/null +++ b/image_contents/cinnamon-x64.packages.txt @@ -0,0 +1,53 @@ +#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 +xauth +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +lxdm +pm-utils +nano +xdg-utils +git +vim +bash-completion +cinnamon +xrandr +colord +gnome-terminal +alsa-utils +pavucontrol +xterm +htop +tuxc +ntp +octoxbps +gksu +void-repo-multilib +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +firefox diff --git a/image_contents/i3-x64.packages.txt b/image_contents/i3-x64.packages.txt new file mode 100644 index 0000000..d23f5ad --- /dev/null +++ b/image_contents/i3-x64.packages.txt @@ -0,0 +1,55 @@ +#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 +xauth +xrandr +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +lxdm +pm-utils +nano +xdg-utils +git +vim +bash-completion +i3-gaps +i3blocks +i3status +alsa-utils +pulsemixer +pasystray +xterm +mc +htop +tuxc +ntp +dmenu +sakura +void-repo-multilib +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +qutebrowser diff --git a/image_contents/lxde-x64.packages.txt b/image_contents/lxde-x64.packages.txt new file mode 100644 index 0000000..722ab90 --- /dev/null +++ b/image_contents/lxde-x64.packages.txt @@ -0,0 +1,52 @@ +#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 +ntp +octoxbps +gksu +void-repo-multilib +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +falkon diff --git a/image_contents/lxqt-x64.packages.txt b/image_contents/lxqt-x64.packages.txt new file mode 100644 index 0000000..3673274 --- /dev/null +++ b/image_contents/lxqt-x64.packages.txt @@ -0,0 +1,53 @@ +#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 +xrandr +intel-ucode +setxkbmap +xauth +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +qt5-plugin-sqlite +pm-utils +nano +bash-completion +git +xdg-utils +vim +lxdm +lxqt +lxterminal +alsa-utils +pavucontrol +xterm +htop +tuxc +ntp +octoxbps +gksu +void-repo-multilib +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +falkon diff --git a/image_contents/mate-x64.packages.txt b/image_contents/mate-x64.packages.txt new file mode 100644 index 0000000..db987eb --- /dev/null +++ b/image_contents/mate-x64.packages.txt @@ -0,0 +1,50 @@ +#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 +xauth +xrandr +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +lxdm +mate +mate-extra +bash-completion +caja-extensions +alsa-utils +xdg-utils +pavucontrol +alsa-plugins-pulseaudio +xterm +htop +tuxc +ntp +octoxbps +gksu +void-repo-multilib +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +firefox diff --git a/image_contents/xfce-x64.packages.txt b/image_contents/xfce-x64.packages.txt new file mode 100644 index 0000000..c2b2d42 --- /dev/null +++ b/image_contents/xfce-x64.packages.txt @@ -0,0 +1,60 @@ +#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 +xrandr +intel-ucode +setxkbmap +xauth +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +lxdm +xdg-utils +zenity +bash-completion +pm-utils +nano +xdg-utils +vim +git +alsa-utils +paprefs +pasystray +pavucontrol +xterm +htop +tuxc +ntp +void-repo-multilib +void-repo-nonfree +octoxbps +gksu +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +ntfs-3g +gnome-keyring +network-manager-applet +firefox +xfce4 +xfce4-plugins +Adapta +papirus-icon-theme +gnome-themes-standard diff --git a/kde-x64.packages b/kde-x64.packages index e7bad7a..61b2edc 100644 --- a/kde-x64.packages +++ b/kde-x64.packages @@ -7,13 +7,11 @@ dialog cryptsetup lvm2 mdadm -ConsoleKit2 # X PACKAGES xorg xorg-input-drivers xorg-video-drivers -intel-ucode setxkbmap xauth xrandr @@ -32,6 +30,19 @@ 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 @@ -44,6 +55,7 @@ curl xterm htop tuxc +topgrade keepassxc octoxbps ntp @@ -61,6 +73,9 @@ NetworkManager plasma-nm firefox kde5 +kde5-baseapps +kaccounts-integration +kaccounts-providers dolphin adapta-kde papirus-icon-theme diff --git a/kde-x64.sh b/kde-x64.sh index 4123f68..5222ba7 100755 --- a/kde-x64.sh +++ b/kde-x64.sh @@ -23,12 +23,22 @@ sudo ./mklive.sh \ -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 +fi sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi -mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build \ No newline at end of file +mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build diff --git a/lxde-x64.packages b/lxde-x64.packages index 722ab90..91fd83d 100644 --- a/lxde-x64.packages +++ b/lxde-x64.packages @@ -32,12 +32,26 @@ git vim lxde 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 gnome-terminal alsa-utils pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/lxde-x64.sh b/lxde-x64.sh index 250049a..2f2fe25 100755 --- a/lxde-x64.sh +++ b/lxde-x64.sh @@ -5,7 +5,7 @@ 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 +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -19,14 +19,25 @@ 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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi diff --git a/lxqt-x64.packages b/lxqt-x64.packages index 3673274..6bf1977 100644 --- a/lxqt-x64.packages +++ b/lxqt-x64.packages @@ -30,6 +30,19 @@ 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 +52,7 @@ pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/lxqt-x64.sh b/lxqt-x64.sh index b37eb8e..dde3390 100755 --- a/lxqt-x64.sh +++ b/lxqt-x64.sh @@ -5,7 +5,7 @@ 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 +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -19,17 +19,28 @@ 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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi -mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build \ No newline at end of file +mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build diff --git a/mate-x64.packages b/mate-x64.packages index db987eb..8d0511c 100644 --- a/mate-x64.packages +++ b/mate-x64.packages @@ -31,11 +31,25 @@ 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 +topgrade ntp octoxbps gksu diff --git a/mate-x64.sh b/mate-x64.sh index 340ab50..1611b20 100755 --- a/mate-x64.sh +++ b/mate-x64.sh @@ -5,8 +5,7 @@ echo "| MATE 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 - +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -20,15 +19,27 @@ BUILDDIR="$(pwd)/build" -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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi diff --git a/mv-images.sh b/mv-images.sh index 6ea0303..2b371bf 100755 --- a/mv-images.sh +++ b/mv-images.sh @@ -3,6 +3,11 @@ HTMLDIR="/var/www/voidbuilds.xyz/public" PKGLISTDIR="package_lists" +if [ ! -f sha256sums.txt ];then + echo "checksum file not found, aborting!" + exit 1 +fi + if [ -d "${HTMLDIR}" ];then rm ${HTMLDIR}/*.iso rm ${HTMLDIR}/*.txt diff --git a/package_lists/base-x64.packages.txt b/package_lists/base-x64.packages.txt index 0c82dd2..9f7e7af 100644 --- a/package_lists/base-x64.packages.txt +++ b/package_lists/base-x64.packages.txt @@ -20,6 +20,7 @@ git xterm htop tuxc +topgrade ntp void-repo-multilib ntfs-3g diff --git a/package_lists/cinnamon-x64.packages.txt b/package_lists/cinnamon-x64.packages.txt index e167cf6..eccbb4d 100644 --- a/package_lists/cinnamon-x64.packages.txt +++ b/package_lists/cinnamon-x64.packages.txt @@ -29,6 +29,10 @@ nano xdg-utils git vim +dtrx +unzip +p7zip +unrar bash-completion cinnamon xrandr @@ -39,6 +43,7 @@ pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/package_lists/e17-x64.packages.txt b/package_lists/e17-x64.packages.txt new file mode 100644 index 0000000..e922c72 --- /dev/null +++ b/package_lists/e17-x64.packages.txt @@ -0,0 +1,62 @@ +#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 +xrandr +intel-ucode +setxkbmap +xauth +font-misc-misc +terminus-font +dejavu-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +lxdm +enlightenment +terminology +econnman +xdg-utils +zenity +bash-completion +pm-utils +nano +xdg-utils +vim +git +alsa-utils +paprefs +pasystray +pavucontrol +xterm +htop +tuxc +topgrade +ntp +void-repo-multilib +void-repo-nonfree +octoxbps +gksu +gvfs-afc +gvfs-mtp +gvfs-smb +udisks2 +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 index d23f5ad..68f473d 100644 --- a/package_lists/i3-x64.packages.txt +++ b/package_lists/i3-x64.packages.txt @@ -41,6 +41,7 @@ xterm mc htop tuxc +topgrade ntp dmenu sakura diff --git a/package_lists/lxde-x64.packages.txt b/package_lists/lxde-x64.packages.txt index 722ab90..301ebfc 100644 --- a/package_lists/lxde-x64.packages.txt +++ b/package_lists/lxde-x64.packages.txt @@ -38,6 +38,7 @@ pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/package_lists/lxqt-x64.packages.txt b/package_lists/lxqt-x64.packages.txt index 3673274..ac79f17 100644 --- a/package_lists/lxqt-x64.packages.txt +++ b/package_lists/lxqt-x64.packages.txt @@ -39,6 +39,7 @@ pavucontrol xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/package_lists/mate-x64.packages.txt b/package_lists/mate-x64.packages.txt index db987eb..ab638bd 100644 --- a/package_lists/mate-x64.packages.txt +++ b/package_lists/mate-x64.packages.txt @@ -36,6 +36,7 @@ alsa-plugins-pulseaudio xterm htop tuxc +topgrade ntp octoxbps gksu diff --git a/package_lists/xfce-x64.packages.txt b/package_lists/xfce-x64.packages.txt index c2b2d42..84cb807 100644 --- a/package_lists/xfce-x64.packages.txt +++ b/package_lists/xfce-x64.packages.txt @@ -40,6 +40,7 @@ pavucontrol xterm htop tuxc +topgrade ntp void-repo-multilib void-repo-nonfree diff --git a/sha256sums.txt b/sha256sums.txt new file mode 100644 index 0000000..1b680bb --- /dev/null +++ b/sha256sums.txt @@ -0,0 +1,65 @@ +8915aaebde94fd0f63f36a00e5863c88d43317995bf52463b975f9c781ba4695 void-live-unofficial-x86_64-5.3.10_1-20191112.iso +d20bb0a17d2db34f99dfa8a6bef31de121de1f0d26e1a576f812887cc3832ba6 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191112.iso +5fff810f1c6e91d633b77e40ce93c6856cd6d8f30982bcb9b09803606938d466 void-live-i3-unofficial-x86_64-5.3.10_1-20191112.iso +a4bb97050636ae8bcaf4c111e2e08cd1c38c08142dde9b1be7f0e3ef30a15415 void-live-e17-unofficial-x86_64-5.3.10_1-20191112.iso +2a1514b1e229c28c96683b74d1d36cd74b90d67bf8413e0aa043f9fe405135d2 void-live-kde-unofficial-x86_64-5.3.10_1-20191112.iso +f64de572111dbac668578a347ed39f5d6e970f527117118fe7681bdaa1ced16f void-live-lxde-unofficial-x86_64-5.3.10_1-20191112.iso +a557acf23f338b070959ae9e7f0a20bb7dbb83684aeed2ca098c2ed7212c3ff5 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191112.iso +c5317a197965a6694e0734c8ccff441baeff9bf467f5f948a93a08aabb575fbf void-live-mate-unofficial-x86_64-5.3.10_1-20191112.iso +9346a09ee680e12c5b21bb50f35f06cbfa51fd4cb5caa31ced1b2fae788b1465 void-live-unofficial-x86_64-5.3.10_1-20191113.iso +ccfeb30d3b69799a1707685c06bff6bad8cf5a1984cd49649297a93ad88a41c2 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191113.iso +7b07da99b650dd9947414e5431c6f112fc68e12bc581ae5d0abfec07da87d4e0 void-live-i3-unofficial-x86_64-5.3.10_1-20191113.iso +aab045385ce946b032251338a83d34aacf3fdd4c55f182254250c53f481693db void-live-e17-unofficial-x86_64-5.3.10_1-20191113.iso +2d90ede9858fee8b2c85a52339ac058f88d827b4626686f223ad6575ebdeb175 void-live-kde-unofficial-x86_64-5.3.10_1-20191113.iso +04e2bc456bfd18e18c7545de6cf15b363a00e0633a69c2fa801cb3b5d8ad29c0 void-live-lxde-unofficial-x86_64-5.3.10_1-20191113.iso +09352e87b7f45f9e3f3c47a48f1d771f5dab77f6fc7e8903ee3a7b54a20aae48 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191113.iso +2ddf3253dd4647a4214fb822f791a2df4e8e1f44b6c090255e08f18ae7ae88f9 void-live-mate-unofficial-x86_64-5.3.10_1-20191113.iso +0daec0a7a698f5925b67f4a0fce6d8684a933c5329f0227ea78e862e5395d459 void-live-unofficial-x86_64-5.3.10_1-20191114.iso +95ca4307494f135828f5129fea604cec276cf4abc2031694ce9f478e47ae2c49 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191114.iso +d66026192e78270ff20eb06fc5937cf44ae55fa626a16a6d963c2e83bcddd718 void-live-i3-unofficial-x86_64-5.3.10_1-20191114.iso +f8002c79224e93141145dabd614f48327ab1b059969d51e8d45bb052d855a321 void-live-e17-unofficial-x86_64-5.3.10_1-20191114.iso +cbd6076ba902f0b5ace34410a6b78888130f5a2aa026123377777c2b240f0034 void-live-kde-unofficial-x86_64-5.3.10_1-20191114.iso +6e914505f22d1adee83d72b1c597bc8c7f782ee7bb4909f00b1e959c0d350a49 void-live-lxde-unofficial-x86_64-5.3.10_1-20191114.iso +569ddb437e2d35d787fb3207e9a85f33f8cda96ab06a7ff834babb58f421a063 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191114.iso +8e745760fb4bd85528100f25ccbd49fa6ffdb03e4aca64c544dd3acb04d51ebb void-live-mate-unofficial-x86_64-5.3.10_1-20191114.iso +83bbeccaf0ffe9238d0ece253816be30a7ebf98a2366bd508bbc34eac4dfb4df void-live-unofficial-x86_64-5.3.10_1-20191115.iso +5a571b0b0196ff42c688e51487833409e4682249b07d8b9aa78f86dc00f2675a void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191115.iso +3f8728561170bdc849df13d2c13b73c1decd65db17f2577105ea670906b3a77d void-live-i3-unofficial-x86_64-5.3.10_1-20191115.iso +1c5fabf99419c18334798e85baa6b56caf521fad152b4cc5a12293799c9446fa void-live-e17-unofficial-x86_64-5.3.10_1-20191115.iso +886cb486053dfac1b0a8d7449ae498f6485f46994b974f846739d1e3df35abaa void-live-kde-unofficial-x86_64-5.3.10_1-20191115.iso +861e65b4c3a66e7cad1218dbab5636cc50e447db6fd3836c85357821e0243828 void-live-lxde-unofficial-x86_64-5.3.10_1-20191115.iso +71738a3f3ab39108a5630e45888fc903b3ee5389913142f77194205f674b1b10 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191115.iso +75ae7c3861421d0658e08f8ff173e49b1a2c82ef43da84ad1d38c95ad6248b3f void-live-mate-unofficial-x86_64-5.3.10_1-20191115.iso +9e34442153ec7887ea757b8561a67405a77ee508435075d81feb58211d474b15 void-live-unofficial-x86_64-5.3.10_1-20191115.iso +98fd0c62094ff9f23e273db2311ce4449361bfeda0fbf05abddd670dd3e96701 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191115.iso +4b73e0929904c54bbba526ce0069759d5acaf9edba9488dd51b68ae9e5f9baf7 void-live-i3-unofficial-x86_64-5.3.10_1-20191115.iso +8b57f7ec0de614e78a1b0eb267f9063af1618f3045345a78f94abeabf286083d void-live-e17-unofficial-x86_64-5.3.10_1-20191115.iso +3ad03d0fd7f94297c836f711a61f41e9f83f4df23d5641567ae5a034c3f67c92 void-live-kde-unofficial-x86_64-5.3.10_1-20191115.iso +fd732aaac01f1ec1ab7ca716fca9c3ba71ddd3c28613277ed7ebaa2c850ab167 void-live-lxde-unofficial-x86_64-5.3.10_1-20191115.iso +7fc926e296446501aa59744fb328f156abf53ac282b2b23941bcbcb44920d879 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191115.iso +08e12b176ae05effc0f45f75a7b7521c5b3d70dea1d3ca611ed82741050944e2 void-live-mate-unofficial-x86_64-5.3.10_1-20191115.iso +1600c0b3fbc97495e468bbcda621a6986d3a303a2131c79b79c118b3b4cd5394 void-live-unofficial-x86_64-5.3.10_1-20191116.iso +59d9b18b96d5d0cac173435608c17c6a669f22e06c8ba4c10bdf84f845257944 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191116.iso +d9a941a9b0480948266c09f91af869fe3e4628c352f402881cc49255bd94461c void-live-i3-unofficial-x86_64-5.3.10_1-20191116.iso +b042740d5d6de7b0214d1df2334371f8b5396e0dcd230ba81b65f6bcf99d8060 void-live-e17-unofficial-x86_64-5.3.10_1-20191116.iso +593d0a603f3c8fd2404f7977f366553e05c17f8886c57ea806720cec81b4a06c void-live-kde-unofficial-x86_64-5.3.10_1-20191116.iso +c4afc82e6ee28bd41350d3845da1aef23369bdce0dc9b7b9b8821855a8d9bdab void-live-lxde-unofficial-x86_64-5.3.10_1-20191116.iso +7dd101f1f20ad5d5250c7e4edb2aeff67db337928d4b3e36eebab99458873364 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191116.iso +7b07dc1fcdf72f3b11b3ae0e481eb8fa6c1e4e4d5597b42d1a6989c1b3a7d04f void-live-mate-unofficial-x86_64-5.3.10_1-20191116.iso +3d6e58129563b5da3ae0b543847e1c3e55c2668cde75ccbd92826095cf627025 void-live-unofficial-x86_64-5.3.10_1-20191117.iso +d59d1f76cc3d44bd10dae5c274dadb110611fe45b00ae48195f6c7f7c4cdbe11 void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191117.iso +01e0386c8c31bd7277bfc4c788b0b4dcb9a9eeb018dd813236986af24dd97649 void-live-i3-unofficial-x86_64-5.3.10_1-20191117.iso +aaa6f99229ec369a4b9220be687b3f1b14d6e5fe0018065bc8bc5a627853e4a9 void-live-e17-unofficial-x86_64-5.3.10_1-20191117.iso +32d62e1ce465180875e8f694179272fd4876967b128db9747ac7989b048a44c8 void-live-kde-unofficial-x86_64-5.3.10_1-20191117.iso +e15e3a6ebb09fb8b8b6dd8668a1fa9a14c5ffee9ddd5bdd3b28533b35b221856 void-live-lxde-unofficial-x86_64-5.3.10_1-20191117.iso +d2f18e39de65d2474395322c27dc5403a2c13d97db5043af6de3d306d4605b29 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191117.iso +21bbafea954760ce28c8d3212cdf62fc924313ac59b9d1ea0f85ebae96c4fe6f void-live-mate-unofficial-x86_64-5.3.10_1-20191117.iso +65c5e72988fc1ad6bb7d7893b4f8d3b631e3c61b53ccd5d71027beda95d81626 void-live-unofficial-x86_64-5.3.10_1-20191117.iso +91faddf52fdaeaf7c933cbc39ea5ca0494ba8edc1ac6e7d81fa95e03e77be41d void-live-cinnamon-unofficial-x86_64-5.3.10_1-20191117.iso +3da94ba1c032a0f96be1e093cb1239818c12e5b2d308142f27669792c98ba56b void-live-i3-unofficial-x86_64-5.3.10_1-20191117.iso +04c64f367e8372d9fad9dc37c7338cf961dbb90628060ff025a9b3a32c89f67a void-live-e17-unofficial-x86_64-5.3.10_1-20191117.iso +96ea55586c97df406fc1284db84a75517a358dcac1e2ddaa6b58290180245d4d void-live-kde-unofficial-x86_64-5.3.10_1-20191117.iso +8266c35162fdd8ca5d2187650a35d9e73cb4383b790b810e01b7f7ba1b6d60db void-live-lxde-unofficial-x86_64-5.3.10_1-20191118.iso +b528d0d938b1ac173bd72be13764cb58ef29b2c7755e804b1eb054ead6985096 void-live-lxqt-unofficial-x86_64-5.3.10_1-20191118.iso +3392f911fa4b1f9d09541fac0bd16228e70b7b1a4696d00e3594546065ed7b0a void-live-mate-unofficial-x86_64-5.3.10_1-20191118.iso +3830cda09b0bdb793a4833f9a071b09d14d91b151f70ff6a07c758835f8f3bfb void-live-unofficial-x86_64-5.3.10_1-20191119.iso diff --git a/tom-x64.packages b/tom-x64.packages new file mode 100644 index 0000000..929089b --- /dev/null +++ b/tom-x64.packages @@ -0,0 +1,72 @@ +#GRUB +grub-i386-efi +grub-x86_64-efi + +#BASE PKGS +dialog +cryptsetup +lvm2 +mdadm +ConsoleKit2 + +# X PACKAGES +xorg +xorg-input-drivers +xorg-video-drivers +intel-ucode +setxkbmap +xauth +xrandr +font-misc-misc +terminus-font +dejavu-fonts-ttf +liberation-fonts-ttf +alsa-plugins-pulseaudio + + +#USERLAND PACKAGES +sddm +konsole +bash-completion +pm-utils +nano +git +vim +xdg-utils +alsa-utils +alsa-plugins-pulseaudio +plasma-pa +pavucontrol +inetutils +usbutils +wget +curl +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 +dolphin +adapta-kde +shotcut +rawtherapee +digikam +olive +telegram-desktop +chromium +flatpak diff --git a/voidbuilds-logo.png b/voidbuilds-logo.png new file mode 100644 index 0000000..e7337e6 Binary files /dev/null and b/voidbuilds-logo.png differ diff --git a/xfce-x64.packages b/xfce-x64.packages index c2b2d42..b7ffbab 100644 --- a/xfce-x64.packages +++ b/xfce-x64.packages @@ -26,6 +26,19 @@ alsa-plugins-pulseaudio #USERLAND PACKAGES 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 @@ -40,6 +53,7 @@ pavucontrol xterm htop tuxc +topgrade ntp void-repo-multilib void-repo-nonfree diff --git a/xfce-x64.sh b/xfce-x64.sh index a4c5d8c..5ddb966 100755 --- a/xfce-x64.sh +++ b/xfce-x64.sh @@ -5,7 +5,7 @@ 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 +NONFREE=https://alpha.de.repo.voidlinux.org/current/nonfree FILENAME="void-live-${DESKTOP}-unofficial" DATE=$(date +%Y%m%d) KERNEL=$(uname -r) @@ -19,16 +19,27 @@ 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 - +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 sha256sum ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso >> sha256sums.txt +if [ ! -f sha256sums.txt ];then + echo "Missing checksum file, aborting!" + echo "ERR=1" > error-status.txt + exit 1 +fi + if [ ! -d "${BUILDDIR}" ];then mkdir ${BUILDDIR} fi -mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build \ No newline at end of file +mv ${FILENAME}-x86_64-${KERNEL}-${DATE}.iso build