setup-util-bash: fix manjaro conflict

.github/workflows/dorothy-workflow.yml

@@ -167,13 +167,11 @@ jobs:
             # for alpine
             apk update
             apk add bash curl git grep
-          elif command -v pamac; then
-            # for manjaro, prefer over arch as majaro also contains pacman
-            pamac install --no-confirm bash curl
           elif command -v pacman; then
-            # for arch
+            # for manjaro and arch
             pacman-key --init
-            pacman --refresh --sync --needed --noconfirm bash curl
+            pacman --noconfirm --refresh --sync # manjaro CI currently ships with bashrc-manjaro, bashrc, and bash all broken
+            pacman --noconfirm --refresh --sync --needed bash curl
           elif command -v urpmi; then
             # for mageia, prefer over fedora as mageia also contains dnf
             # https://wiki.mageia.org/en/Cauldron

.trunk/trunk.yaml

@@ -1,11 +1,11 @@
 # https://features.trunk.io/check/p/trunk-doesnt-work-in-nested-repo
 version: 0.1
 cli:
-  version: 1.19.0
+  version: 1.20.1
 plugins:
   sources:
     - id: trunk
-      ref: v1.4.2
+      ref: v1.4.3
       uri: https://github.com/trunk-io/plugins
 runtimes:
   enabled:
@@ -22,20 +22,20 @@ lint:
   enabled:
     - [email protected]
     - [email protected]
-    - [email protected].20
+    - [email protected].22
     - [email protected]
     - [email protected]
     - git-diff-check@SYSTEM
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].1
+    - [email protected].2
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].6
-    - yamllint@1.34.0
+    - [email protected].7
+    - yamllint@1.35.1
   disabled:
     - trivy
     - oxipng # broken for some reason on my mac mini

commands/dorothy

@@ -323,6 +323,11 @@ function dorothy_() (
 		test "$(uname -s)" = 'Linux'
 	}
 
+	# see commands/is-manjaro for details
+	function __is_manjaro {
+		uname -r | grep --quiet --ignore-case --fixed-strings --regexp='manjaro'
+	}
+
 	# see commands/fs-realpath for details
 	function __fs_realpath {
 		# options
@@ -446,11 +451,11 @@ function dorothy_() (
 				# for alpine
 				__try_sudo apk add bash curl grep git ncurses coreutils moreutils gawk
 			elif __command_exists pamac; then
-				# for manjaro, prefer over arch as majaro also contains pacman
+				# for manjaro that has pamac installed
 				__try_sudo pamac install --no-confirm bash curl git ncurses procps-ng coreutils moreutils gawk
 			elif __command_exists pacman; then
-				# for arch
-				__try_sudo pacman --refresh --sync --needed --noconfirm bash curl git ncurses procps-ng coreutils moreutils gawk
+				# for manjaro and arch
+				__try_sudo pacman --noconfirm --refresh --sync --needed bash curl git ncurses procps-ng coreutils moreutils gawk
 			elif __command_exists urpmi; then
 				# for mageia, prefer over fedora as mageia contains dnf
 				# No package named moreutils
@@ -839,7 +844,6 @@ function dorothy_() (
 
 		# helpers
 		function install_dorothy {
-			local clone_args=()
 			print_line "Installing Dorothy into $DOROTHY"
 			if test -n "$option_branch"; then
 				git clone --branch "$option_branch" --single-branch "https://github.com/$option_slug.git" "$DOROTHY"

commands/setup-linux

@@ -153,7 +153,7 @@ function setup_linux() (
 		# this is needed on systems which pacman was installed
 		sudo-helper -- pacman-key --init
 		# refresh the local database
-		sudo-helper -- pacman --refresh --sync --noconfirm
+		sudo-helper -- pacman --noconfirm --refresh --sync
 	}
 
 	function do_urpmi_update {

commands/setup-util

@@ -879,8 +879,6 @@ function setup_util() (
 			args+=(
 				'pacman'
 				'--noconfirm'
-				'--refresh'
-				'--sync'
 				'--remove'
 			)
 		elif test "$option_upgrade" = 'yes'; then

commands/setup-util-bash

@@ -45,9 +45,9 @@ function setup_util_bash() (
 		AUR='bash' # ARCH
 		BREW='bash'
 		EMERGE='app-shells/bash' # GENTOO
-		URPMI='bash'             # MAGEIA
 		NIX='nixpkgs.bash'
 		RPM='bash'    # FEDORA
+		URPMI='bash'  # MAGEIA
 		XBPS='bash'   # VOID
 		ZYPPER='bash' # SUSE
 	)

package.json

@@ -135,8 +135,8 @@
   ],
   "devDependencies": {
     "@bevry/github-api": "^11.4.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
     "eslint-config-bevry": "^5.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",