From 2bdf8306f5be797f82484e55d1aa022a80b65649 Mon Sep 17 00:00:00 2001 From: mollusk Date: Fri, 3 Jul 2020 21:31:16 -0700 Subject: [PATCH] add dwm, format xfce package list --- .dockerignore | 0 .gitignore | 0 build-images.sh | 51 ++++--- cinnamon-x64.packages | 5 +- dwm-x64.packages | 71 +++++++++ e17-x64.packages | 5 +- gnome-x64.packages | 3 + i3-x64.packages | 3 + kde-x64.packages | 2 + lxde-x64.packages | 3 + lxqt-x64.packages | 3 + mate-x64.packages | 7 +- package_lists/cinnamon-x64.packages.txt | 5 +- package_lists/e17-x64.packages.txt | 5 +- package_lists/i3-x64.packages.txt | 3 + package_lists/kde-x64.packages.txt | 2 + package_lists/lxqt-x64.packages.txt | 3 + package_lists/mate-x64.packages.txt | 7 +- package_lists/xfce-x64.packages.txt | 6 +- sha256sums.txt | 65 --------- xfce-x64.packages | 182 +++++++++++++++--------- 21 files changed, 272 insertions(+), 159 deletions(-) mode change 100644 => 100755 .dockerignore mode change 100644 => 100755 .gitignore create mode 100755 dwm-x64.packages delete mode 100644 sha256sums.txt diff --git a/.dockerignore b/.dockerignore old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/build-images.sh b/build-images.sh index e26fdb0..032f12c 100755 --- a/build-images.sh +++ b/build-images.sh @@ -5,13 +5,9 @@ FILENAME="status.html" ISODIR="download" -echo "checking for updates" -xbps-install -Syu && xbps-install -yu - - - - mvImages(){ +# move image files to final destination + PKGLISTDIR="package_lists" if [ ! -f sha256sums.txt ];then @@ -52,7 +48,7 @@ mvImages(){ } runBuilds(){ - TOTAL="8" + TOTAL="9" ERR_FILE="error-status.txt" if [ -f "${ERR_FILE}" ];then @@ -94,10 +90,7 @@ runBuilds(){ 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..." @@ -192,6 +185,20 @@ runBuilds(){ echo "8/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} fi + + echo "Building Image: DWM
" >> ${HTMLDIR}/${FILENAME} + echo "Building: DWM Image..." + sleep 1 + ./dwm-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 "9/${TOTAL} completed at $(date +%T)

" >> ${HTMLDIR}/${FILENAME} + fi + if [ ! -f sha256sums.txt ];then echo "sha manifest does not exist!" else @@ -254,7 +261,7 @@ genHtml(){ echo 'setTimeout("location.reload(true);",timeoutPeriod);' >> ${HTMLDIR}/${FILENAME} echo '}' >> ${HTMLDIR}/${FILENAME} - echo 'window.onload = timedRefresh(10000);' >> ${HTMLDIR}/${FILENAME} + echo 'window.onload = timedRefresh(60000);' >> ${HTMLDIR}/${FILENAME} echo "" >> ${HTMLDIR}/${FILENAME} echo "