Fix version compare on 3.3.2.1666, fix keyd configure

Author: Eeems

package/keyd/package

@@ -43,7 +43,7 @@ package() {
 }
 
 configure() {
-    addgroup keyd
+    grep -qw ^keyd /etc/group || addgroup keyd
     systemctl daemon-reload
     if is-active keyd; then
         systemctl restart keyd
@@ -58,7 +58,7 @@ configure() {
 
 preremove() {
     disable-unit keyd
-    delgroup keyd
+    grep -qw ^keyd /etc/group && delgroup keyd
 }
 
 postremove() {

package/toltec-bootstrap/toltecctl

@@ -656,7 +656,7 @@ get-branch() {
 #
 # Output: Sortable version number
 function version {
-    echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'
+    echo "$@" | awk -F. '{ printf("%d%04d%04d%04d\n", $1,$2,$3,$4); }'
 }
 
 # Compare two version numbers
@@ -709,11 +709,11 @@ switch-branch() {
     model="$(identify-model)"
     version="$(identify-support-version)"
 
-    if [[ $model = "unknown" ]]; then
+    if [[ $model == "unknown" ]]; then
         log ERROR "You’re running an unsupported or unrecognised device"
         exit 1
     fi
-    if [[ $version = "unknown" ]]; then
+    if [[ $version == "unknown" ]]; then
         log ERROR "You're running an unsupported or unrecognised OS version"
         exit 1
     fi

package/toltec-deletions/package

@@ -21,18 +21,13 @@ section="utils"
 maintainer="Eeems <[email protected]>"
 license=MIT
 installdepends=(toltec-bootstrap)
-conflicts_rm1os2=()
+
 replaces_rm1os2=()
-conflicts_rm2os2=()
+conflicts_rm1os2=$replaces_rm1os2
+
 replaces_rm2os2=()
-conflicts_rm1os3=(
-    ddvk-hacks
-    fuse
-    wireguard
-    innernet-client
-    gocryptfs
-    remarkable-stylus
-)
+conflicts_rm2os2=$replaces_rm2os2
+
 replaces_rm1os3=(
     ddvk-hacks
     fuse
@@ -41,14 +36,8 @@ replaces_rm1os3=(
     gocryptfs
     remarkable-stylus
 )
-conflicts_rm1os3v22=(
-    ddvk-hacks
-    fuse
-    wireguard
-    innernet-client
-    gocryptfs
-    remarkable-stylus
-)
+conflicts_rm1os3=$replaces_rm1os3
+
 replaces_rm1os3v22=(
     ddvk-hacks
     fuse
@@ -57,15 +46,8 @@ replaces_rm1os3v22=(
     gocryptfs
     remarkable-stylus
 )
-conflicts_rm2os3=(
-    ddvk-hacks
-    fuse
-    wireguard
-    innernet-client
-    gocryptfs
-    remarkable-stylus
-    open-remarkable-shutdown
-)
+conflicts_rm1os3v22=$replaces_rm1os3v22
+
 replaces_rm2os3=(
     ddvk-hacks
     fuse
@@ -75,15 +57,8 @@ replaces_rm2os3=(
     remarkable-stylus
     open-remarkable-shutdown
 )
-conflicts_rm2os3v22=(
-    ddvk-hacks
-    fuse
-    wireguard
-    innernet-client
-    gocryptfs
-    remarkable-stylus
-    open-remarkable-shutdown
-)
+conflicts_rm2os3=$replaces_rm2os3
+
 replaces_rm2os3v22=(
     ddvk-hacks
     fuse
@@ -93,10 +68,13 @@ replaces_rm2os3v22=(
     remarkable-stylus
     open-remarkable-shutdown
 )
-conflicts_rmppos3v22=()
+conflicts_rm2os3v22=$replaces_rm2os3v22
+
 replaces_rmppos3v22=()
-conflicts_rmppmos3v22=()
+conflicts_rmppos3v22=$replaces_rmppos3v22
+
 replaces_rmppmos3v22=()
+conflicts_rmppmos3v22=$replaces_rmppmos3v22
 
 source=()
 sha256sums=()