README.md

@@ -1,55 +1,44 @@
-## pve-nag-buster 
+# pve-nag-buster 
 https://github.com/foundObjects/pve-nag-buster
 
-`pve-nag-buster` is a dpkg hook script that persistently removes license nags
+This is a dpkg post install hook script that persistently removes license nags
-from Proxmox VE 6.x and up. Install it once and you won't see another license
+from Proxmox VE 5.x and up. Install it once and you won't see another license
-nag until the Proxmox team  changes their web-ui code in a way that breaks the patch.
+nag until Proxmox changes their web-ui code significantly.
 
 Please support the Proxmox team by [buying a subscription](https://www.proxmox.com/en/proxmox-ve/pricing) if it's within your
 means. High quality open source software like Proxmox needs our support!
 
-### News:
-
-Last updated for: pve-manager/6.4-4/337d6701 (running kernel: 5.4.106-1-pve)
-
 ### How does it work?
 
 The included hook script removes the "unlicensed node" popup nag from the web
 gui and disables the pve-enterprise repository list. This script is called
 every time a package updates the web gui or the pve-enterprise source list and
-will only run if packages containing those files are changed.
+will only run if packages containing those files are changed. The installer
-
+drops the hook script and creates dpkg hooks to call it then adds the
-The installer installs the dpkg hook script, adds the pve-no-subscription repo list
+pve-no-subscription repo list. There are no external dependencies beyond the
-and calls the hook script once. There are no external dependencies beyond the base
+base packages installed with PVE by default (awk, sed, grep, wget).
-packages installed with PVE by default.
 
 ### Installation
-```sh
+```
 wget https://raw.githubusercontent.com/foundObjects/pve-nag-buster/master/install.sh
-
 # Always read scripts downloaded from the internet before running them with sudo
-sudo bash install.sh
-
-# or ..
 chmod +x install.sh && sudo ./install.sh
 ```
 
 With Git:
-```sh
+```
 git clone https://github.com/foundObjects/pve-nag-buster.git
-
 # Always read scripts downloaded from the internet before running them with sudo
 cd pve-nag-buster && sudo ./install.sh
 ```
 
 ### Uninstall:
-```sh
+```
-sudo ./install.sh --uninstall
+./install.sh --uninstall
 # remove /etc/apt/sources.list.d/pve-no-subscription.list if desired
 ```
 
 ### Notes:
-
 #### Why is there base64 in my peanut-butter?
 
 For convenience the install script also contains a base64 encoded copy of the
@@ -60,14 +49,51 @@ To inspect the base64 encoded script run `./install.sh --emit`; this dumps the
 encoded copy to stdout and quits. To install using the stored copy just run
 `sudo ./install.sh --offline`, no internet required.
 
-### Thanks to:
+#### Git repo history
 
-- John McLaren for his [blog post](https://www.reddit.com/user/seaqueue) documenting the web gui patch.
+Sorry to all 5 of you who forked the repo before about 2020-01-20; I rewrote
-- [Marlin Sööse](https://github.com/msoose) for the update for PVE 6.3+
+git history to cleanup the commit noise from adding files through GitHub's web
+UI.
+
+If you need to sync a cloned repo with the new history and haven't made any
+changes:
+
+```
+git fetch --all -p -P
+git push -f . origin/master:master
+```
+
+If you've made changes to the code:
+
+Migrating to the new master branch should be fairly straightforward, the v02
+tag repo state in the new commit history is identical to the repo state before
+the rebase.
+
+```
+# save and commit your work
+git commit -a -m "WIP"
+
+# make a backup of your branch Just In Case™
+git checkout -b backup
+git checkout -
+
+git fetch --all
+git rebase -f --onto v02 origin/old-master <your branch here>
+```
+
+I highly recommend picking at least the following bugfix commits if you don't
+want to track new work in master, they fix a couple of potential problems.
+
+* a260891 hook script: fixed grep test issue
+* 427b23b more reliable hook trigger removal
+
+### Credits:
+
+Thanks to John McLaren for his [blog post](https://www.reddit.com/user/seaqueue) documenting the web gui patch:
 
 ### Contact:
 
-[Open an issue](https://github.com/foundObjects/pve-nag-buster/issues) on GitHub
+[Open an issue](https://github.com/foundObjects/pve-nag-buster/issues) on GitHub or contact me as [/u/SeaQueue on Reddit](https://www.reddit.com/user/seaqueue).
 
 Please get in touch if you find a way to improve anything, otherwise enjoy!
 

install.sh

@@ -1,11 +1,10 @@
 #!/bin/sh
-# shellcheck disable=SC2064
+case "$(readlink /proc/$$/exe)" in */bash) set -euo pipefail ;; *) set -eu ;; esac
-set -eu
 
-# pve-nag-buster (v04) https://github.com/foundObjects/pve-nag-buster
+# pve-nag-buster (v03) 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
+# Removes Proxmox VE 5.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
@@ -71,11 +70,21 @@ _install() {
   VERSION_CODENAME=''
   ID=''
   . /etc/os-release
+  case "$ID" in
+    "debian")
       if [ -n "$VERSION_CODENAME" ]; then
         RELEASE="$VERSION_CODENAME"
       else
         RELEASE=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release)
       fi
+      ;;
+    #"ubuntu") # it doesn't look like this is possible anymore
+    #  ;;
+    *)
+      echo "Sorry, I don't know how to handle your Linux distribution '$ID'"
+      exit 1
+      ;;
+  esac
 
   # create the pve-no-subscription list
   echo "Creating PVE no-subscription repo list ..."
@@ -136,28 +145,28 @@ _install() {
 # 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:
+# pve-nag-buster.sh (v03) encoded below:
 
 emit_script() {
   base64 -d << 'YEET' | unxz
-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
+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
-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
+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
-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
+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
-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
+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
-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
+qYqwC05lZZRcxH6rR5siMu0IvrWPOFdk3RC+Hxu6cWGNwQU3Qg2Fp1eL6OxV25ZlKkxHsbV/1RZQ
-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
+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
-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
+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
-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
+cj9ZY9m6TgbXY1CvOb3HPcVxTUWT86agk3YSDiuIEuTXUTY/CF3mtDhk51uWI16D8K/P3JkBnZJl
-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
+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
-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
++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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-zeNfscRn+wIAAAAABFla
+BFla
 YEET
 }
 

make-release.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-_VERS="v04"
+_VERS="v03"
-_BRANCH=$(git rev-parse --abbrev-ref HEAD) >/dev/null 2>&1  ||
+_BRANCH=$(git branch --show-current) >/dev/null 2>&1  ||
   { echo "can't poll branch, defaulting to master" && _BRANCH="master"; }
 
 # update versions before packing install.sh

pve-nag-buster.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# pve-nag-buster.sh (v04) https://github.com/foundObjects/pve-nag-buster
+# pve-nag-buster.sh (v03) 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
+# Removes Proxmox VE 5.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
@@ -19,9 +19,9 @@
 # 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'"
+NAGTOKEN="data.status !== 'Active'"
 NAGFILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
-SCRIPT="$(basename "$0")"
+SCRIPT="$(basename $0)"
 
 # disable license nag: https://johnscs.com/remove-proxmox51-subscription-notice/