Build improvement

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - actions-test
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Make build script executable
+        run: chmod +x source/build.sh
+
+      - name: Run build script
+        run: ./source/build.sh
+
+      - name: Commit and push changes to install.sh
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git add -f install.sh
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+          else
+            git commit -m "Auto-update build/install.sh"
+            git push
+          fi

.gitignore

@@ -0,0 +1 @@
+install.sh

install.sh

@@ -25,24 +25,28 @@ set -eu
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 \unalias -a
 
+# initialize variables
+_init() {
+  path_apt_conf="/etc/apt/apt.conf.d/86pve-nags"
+  path_apt_list_pve="/etc/apt/sources.list.d/pve-no-subscription.list"
+  path_apt_list_ceph="/etc/apt/sources.list.d/ceph-no-subscription.list"
+  path_buster="/usr/share/pve-nag-buster.sh"
+}
+
 # installer main body:
 _main() {
   # ensure $1 exists so 'set -u' doesn't error out
   { [ "$#" -eq "0" ] && set -- ""; } > /dev/null 2>&1
 
+  _init
+
   case "$1" in
-    "--emit")
-      # call the emit_script() function to stdout and exit, use this to verify
-      # that the base64 encoded script below isn't doing anything malicious
-      # does not require root
-      emit_script
-      ;;
     "--uninstall")
       # uninstall, requires root
       assert_root
       _uninstall
       ;;
-    "--install" | "--offline" | "")
+    "--install" | "")
       # install dpkg hooks, requires root
       assert_root
       _install "$@"
@@ -57,12 +61,14 @@ _main() {
 
 _uninstall() {
   set -x
-  [ -f "/etc/apt/apt.conf.d/86pve-nags" ] &&
-    rm -f "/etc/apt/apt.conf.d/86pve-nags"
-  [ -f "/usr/share/pve-nag-buster.sh" ] &&
-    rm -f "/usr/share/pve-nag-buster.sh"
-
-  echo "Script and dpkg hooks removed, please manually remove /etc/apt/sources.list.d/pve-no-subscription.list if desired"
+  [ -f "$path_apt_conf" ] &&
+    rm -f "$path_apt_conf"
+  [ -f "$path_buster" ] &&
+    rm -f "$path_buster"
+
+  echo "Script and dpkg hooks removed, please manually remove sources lists if desired:"
+  echo "\t$path_apt_list_pve"
+  echo "\t$path_apt_list_ceph"
 }
 
 _install() {
@@ -79,89 +85,112 @@ _install() {
 
   # create the pve-no-subscription list
   echo "Creating PVE no-subscription repo list ..."
-  cat <<- EOF > "/etc/apt/sources.list.d/pve-no-subscription.list"
-	# .list file automatically generated by pve-nag-buster at $(date)
-	#
-	# If pve-nag-buster is installed again this file will be overwritten
-	#
+  emit_pve_list > "$path_apt_list_pve"
 
-	deb http://download.proxmox.com/debian/pve $RELEASE pve-no-subscription
-	EOF
+  # create the ceph-no-subscription list
+  echo "Creating Ceph no-subscription repo list ..."
+  emit_ceph_list > "$path_apt_list_ceph"
 
   # create dpkg pre/post install hooks for persistence
   echo "Creating dpkg hooks in /etc/apt/apt.conf.d ..."
-  cat <<- 'EOF' > "/etc/apt/apt.conf.d/86pve-nags"
-	DPkg::Pre-Install-Pkgs {
-	    "while read -r pkg; do case $pkg in *proxmox-widget-toolkit* | *pve-manager*) touch /tmp/.pve-nag-buster && exit 0; esac done < /dev/stdin";
-	};
-
-	DPkg::Post-Invoke {
-	    "[ -f /tmp/.pve-nag-buster ] && { /usr/share/pve-nag-buster.sh; rm -f /tmp/.pve-nag-buster; }; exit 0";
-	};
-	EOF
+  emit_buster_conf > "$path_apt_conf"
 
   # install the hook script
-  temp=''
-  if [ "$1" = "--offline" ]; then
-    # packed script requested
-    temp="$(mktemp)" && trap "rm -f $temp" EXIT
-    emit_script > "$temp"
-  elif [ -f "pve-nag-buster.sh" ]; then
-    # local copy available
-    temp="pve-nag-buster.sh"
-  else
-    # fetch from github
-    echo "Fetching hook script from GitHub ..."
-    tempd="$(mktemp -d)" &&
-      trap "echo 'Cleaning up temporary files ...'; rm -f $tempd/*; rmdir $tempd" EXIT
-    temp="$tempd/pve-nag-buster.sh"
-    wget https://raw.githubusercontent.com/foundObjects/pve-nag-buster/master/pve-nag-buster.sh \
-      -q --show-progress -O "$temp"
-  fi
-  echo "Installing hook script as /usr/share/pve-nag-buster.sh"
-  install -o root -m 0550 "$temp" "/usr/share/pve-nag-buster.sh"
+  temp="$(mktemp)" && trap "rm -f $temp" EXIT
+  emit_buster > "$temp"
+  echo "Installing hook script as $path_buster"
+  install -o root -m 0550 "$temp" "$path_buster"
 
   echo "Running patch script"
-  /usr/share/pve-nag-buster.sh
+  "$path_buster"
 
   return 0
 }
 
-# emit a stored copy of pve-nag-buster.sh offline -- this is intended to be used during
-# offline provisioning where we don't have access to github or a full cloned copy of the
-# project
-
-# run 'install.sh --emit' to dump stored script to stdout
-
-# Important: if you're not me you should probably decode this and read it to make sure I'm not doing
-#            something malicious like mining dogecoin or stealing your valuable cat pictures
-
-# pve-nag-buster.sh (v04) encoded below:
-
-emit_script() {
-  base64 -d << 'YEET' | unxz
-/Td6WFoAAATm1rRGAgAhARwAAAAQz1jM4AYGA5ZdABGIQkY99BY0cwoNj8U0dcgowbs41qLC+aej
-mGQYj9kDeUYQYXlWIuqhoJLO08e8hIe8MoGJqvcVxM5VQehFNPqq4OH1KhbHgYGz5QSdcYFBPv2D
-jY49io85pCEdBXRw6wLkkTOpm7NoQQs6ZJ5F+vtHWz70HmnRfNhHpjrb16GcK0ERg/VLAx58EUIU
-t9OVgypxnKVdJL7/XxL/nUYLT65sn6ZQvKn4HpuPvK5eKgjZfBYJ3Q0CPDeFlXWIew43sqJTwmlX
-drWBSOlU6yMbmhWTJvfLpK9UfBAh6Qwp6UJ6i0Hbwe+d8qKO/SQ1Ciz6qDbM/cLTIENPYvVjlqzV
-jDmBtzdGMfqXXuFbtNB1uIJVUd3o1rRgH0Pau7yYXZVjDxJ5a32NnSwbbxsYqvcDc5QARfe321vH
-ICPQMtds3p/nuCpmMNex8SorApU6X0jvw18w9uMIF7dE2tk0Ge58qiIOH/+V2uVZzAUAUpTa7Gb8
-0aKWiai6f4bMXfLwvUOiDOucGAW2mMzXClpI7m4jrBy+TjSjPSR1JvS2e9ppcVH2vwcXdUOxxybB
-aDCozlkd9DecONOygFJz7J+V323Oe/kocpUmrZjsQTv0kIveFoPKTTkVYX7JPhePK4FJ884pSafp
-D+KYD3iGv3QqUt0rJBFP1IHhCKsRBNAGgDEaWUUCpT7XVRgGnhXcbQYyegBik+zenQOK6VV/t61Y
-S4Jy/U332GBwLIFRjJotutij5xQmly2AnADFu5LauI9Ud8/JaR9A/AnY05eP8LbotD5oAZf973pI
-UJ5kAdMn+tgw4OP26QC35iaDK/EPWNOyz+1pjrfY/cybwBjwstmu4BaTdbNzb3im39wIX7wOcX8e
-NCixn7Q/gi9gDK+i0Ulfi5R20+QenkgNssOJ3kLfhuutsj5mYJ6wYeEE0mshgzDuXK2fW+ehHqtS
-SOTIUn3cTl74GhjX9tlotUaFGdt/yR/8N8TDzc9dRd7As9Eg4gKfP6pnZJnutTB7k7feponsA+3h
-Qbgm0NdjrxL93IdmB6cgJnMUm/A6GJTv5UynUDYwjZO82rUl3zkVGfu5nNKyEWN7K5gfRBi2l5oQ
-kckHNZJwTLt7Vta4OAfd5fraF37aRquLfrI0TGU+wHAqKpwoBpU3YOZ7o5//2CEVk7vrz5O4N6e4
-erl0B2a6XTQ2u/ICDkCLaA2q4FIbMtlCsNHjkKPV5xQO+/maKQAAABUX772XxF0fAAGyB4cMAABV
-zeNfscRn+wIAAAAABFla
-YEET
+assert_root() { [ "$(id -u)" -eq '0' ] || { echo "This action requires root." && exit 1; }; }
+_usage() { echo "Usage: $(basename "$0") (--install|--uninstall)"; }
+
+emit_pve_list() {
+    cat <<EOFPVE
+# .list file automatically generated by pva-nag-buster at $(date)
+# If pve-nag-buster is installed again this file will be overwritten
+
+deb http://download.proxmox.com/debian/pve $RELEASE pve-no-subscription
+EOFPVE
 }
 
-assert_root() { [ "$(id -u)" -eq '0' ] || { echo "This action requires root." && exit 1; }; }
-_usage() { echo "Usage: $(basename "$0") (--emit|--offline|--uninstall)"; }
+emit_ceph_list() {
+    cat <<EOFCEPH
+# .list file automatically generated by pve-nag-buster at $(date)
+# If pve-nag-buster is installed again this file will be overwritten
+
+deb http://download.proxmox.com/debian/ceph-quincy $RELEASE no-subscription
+EOFCEPH
+}
+
+emit_buster_conf() {
+    cat <<'EOFCONF'
+DPkg::Pre-Install-Pkgs {
+	"while read -r pkg; do case $pkg in *proxmox-widget-toolkit* | *pve-manager*) touch /tmp/.pve-nag-buster && exit 0; esac done < /dev/stdin";
+};
+
+DPkg::Post-Invoke {
+	"[ -f /tmp/.pve-nag-buster ] && { /usr/share/pve-nag-buster.sh; rm -f /tmp/.pve-nag-buster; }; exit 0";
+};
+EOFCONF
+}
+
+emit_buster() {
+    cat <<'EOFBUSTER'
+#!/bin/sh
+#
+# pve-nag-buster.sh (v04) https://github.com/foundObjects/pve-nag-buster
+# Copyright (C) 2019 /u/seaQueue (reddit.com/u/seaQueue)
+#
+# Removes Proxmox VE 6.x+ license nags automatically after updates
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+NAGTOKEN="data.status.toLowerCase() !== 'active'"
+NAGFILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
+SCRIPT="$(basename "$0")"
+
+# disable license nag: https://johnscs.com/remove-proxmox51-subscription-notice/
+
+if grep -qs "$NAGTOKEN" "$NAGFILE" > /dev/null 2>&1; then
+  echo "$SCRIPT: Removing Nag ..."
+  sed -i.orig "s/$NAGTOKEN/false/g" "$NAGFILE"
+  systemctl restart pveproxy.service
+fi
+
+# disable paid repo list
+
+ENTERPRISE_BASE="/etc/apt/sources.list.d/pve-enterprise"
+CEPH_BASE="/etc/apt/sources.list.d/ceph"
+
+if [ -f "$ENTERPRISE_BASE.list" ]; then
+  echo "$SCRIPT: Disabling PVE enterprise repo list ..."
+  mv -f "$ENTERPRISE_BASE.list" "$ENTERPRISE_BASE.disabled"
+fi
+
+if [ -f "$CEPH_BASE.list" ]; then
+  echo "$SCRIPT: Disabling Ceph repo list ..."
+  mv -f "$CEPH_BASE.list" "$CEPH_BASE.disabled"
+fi
+
+EOFBUSTER
+}
 
 _main "$@"

source/apt.conf.buster

@@ -0,0 +1,7 @@
+DPkg::Pre-Install-Pkgs {
+	"while read -r pkg; do case $pkg in *proxmox-widget-toolkit* | *pve-manager*) touch /tmp/.pve-nag-buster && exit 0; esac done < /dev/stdin";
+};
+
+DPkg::Post-Invoke {
+	"[ -f /tmp/.pve-nag-buster ] && { /usr/share/pve-nag-buster.sh; rm -f /tmp/.pve-nag-buster; }; exit 0";
+};

source/apt.list.ceph

@@ -0,0 +1,4 @@
+# .list file automatically generated by pve-nag-buster at $(date)
+# If pve-nag-buster is installed again this file will be overwritten
+
+deb http://download.proxmox.com/debian/ceph-quincy $RELEASE no-subscription

source/apt.list.pve

@@ -0,0 +1,4 @@
+# .list file automatically generated by pva-nag-buster at $(date)
+# If pve-nag-buster is installed again this file will be overwritten
+
+deb http://download.proxmox.com/debian/pve $RELEASE pve-no-subscription