devel/g8

@@ -2,7 +2,6 @@
 #dep:g8
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
 G8=$(next-in-path g8 $0)
-if (( $? != 0 )); then exit 1; fi
 
 args=()
 zparseopts -D -E \

lib/next-in-path.zsh

@@ -2,19 +2,12 @@
 # Usage: next-in-path <program name> <current $0>
 typeset -U path
 next-in-path() {
-	local entries=( $(which -a $1) )
+	entries=( $(which -a $1) )
-	local index=${entries[(ie)$2]}
+	index=${entries[(ie)$2]} 
-	local result
 	if [[ $index -le ${#entries} ]]; then
 		# found $0, use next entry
-		result=$entries[$((index + 1))]
+		echo $entries[$((index + 1))]
 	else
-		result=$entries[1]
+		echo $entries[1]
-	fi
-
-	if [[ -n $result ]]; then
-		echo $result
-	else
-		return 1
 	fi
 }

misc/envwrap

@@ -9,6 +9,4 @@ fi
 
 envwrapconf=${XDG_CONFIG_HOME:-$HOME/.config}/envwrap/$program 
 [[ -e $envwrapconf ]] && source $envwrapconf
-next=$(next-in-path "$program" $0)
+$(next-in-path "$program" $0) "$@"
-if (( $? != 0 )); then exit 1; fi
-$next "$@"

misc/pass

@@ -1,6 +1,4 @@
 #!/bin/zsh
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
 export PASSWORD_STORE_ENABLE_EXTENSIONS=true
-next=$(next-in-path pass $0)
+$(next-in-path pass $0) $@
-if (( $? != 0 )); then exit 1; fi
-$next $@

misc/qrshow

@@ -3,5 +3,5 @@
 if [[ -z "$1" ]]; then
 	qrencode -s 40 -o -
 else
-	qrencode -s 40 -o - -- "$*"
+	qrencode -s 40 "$*" -o -
 fi | feh -ZF -

misc/webapp

@@ -11,7 +11,4 @@ profile_dir=${XDG_DATA_HOME:-$HOME/.local/share}/jails/webapp-$profile
 
 mkdir -p $profile_dir
 
-exec firejail ${XAUTHORITY:+--whitelist=$XAUTHORITY} \
+exec firejail ${XAUTHORITY:+--whitelist=$XAUTHORITY} --private=$profile_dir chromium --restore-last-session=false --class=$profile "$@"
-	--dbus-user=filter \
-	--private=$profile_dir \
-	chromium --restore-last-session=false --class=$profile "$@"

misc/xc

@@ -30,18 +30,10 @@ HELP
 
 source ${$(realpath "$0"):h:h}/lib/common.zsh
 
-if [[ -n $WAYLAND_DISPLAY ]]; then
-	function get_primary() { wl-paste -p }
-	function get_clipboard() { wl-paste }
-	function set_primary() { wl-copy -p }
-	function set_clipboard() { wl-copy }
-else
 function get_primary() { xclip -o -selection primary }
 function get_clipboard() { xclip -o -selection clipboard }
 function set_primary() { xclip -i -selection primary }
 function set_clipboard() { xclip -i -selection clipboard }
-fi
-
 function show_both() {
 	printf "\e[1;94mPrimary\e[0m\n"
 	get_primary
@@ -103,3 +95,4 @@ case "${0:t}" in
 		esac
 		;;
 esac
+

void/xrestricted

@@ -1,5 +1,5 @@
 #!/bin/zsh
-#dep:xi xbps-checkvers rg
+#dep:xi xbps-checkvers ag
 
 source ${$(realpath "$0"):h:h}/lib/common.zsh
 
@@ -62,7 +62,7 @@ else
 	succeed "on $branch"
 fi
 
-packages=( $(rg -g 'template' restricted=yes srcpkgs/ | cut -d/ -f 2 | sort -u) )
+packages=( $(ag -G 'template' restricted=yes srcpkgs/ | cut -d/ -f 2 | sort -u) )
 
 version() { grep -Poe '(?<=^version=).*$' srcpkgs/$1/template }
 install_restricted() {

xdg-wrappers/abcde

@@ -1,6 +1,4 @@
 #!/bin/zsh
 #dep:abcde
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
-next=$(next-in-path abcde $0)
+$(next-in-path abcde $0) -c ${XDG_CONFIG_HOME:-$HOME/.config}/abcde/abcde.conf $@
-if (( $? != 0 )); then exit 1; fi
-$next -c ${XDG_CONFIG_HOME:-$HOME/.config}/abcde/abcde.conf $@

xdg-wrappers/mbsync

@@ -1,6 +1,4 @@
 #!/bin/zsh
 #dep:mbsync
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
-next=$(next-in-path mbsync $0)
+$(next-in-path mbsync $0) -c ${XDG_CONFIG_HOME:-$HOME/.config}/mbsyncrc $@
-if (( $? != 0 )); then exit 1; fi
-$next -c ${XDG_CONFIG_HOME:-$HOME/.config}/mbsyncrc $@

xdg-wrappers/mvn

@@ -1,6 +1,4 @@
 #!/bin/zsh
 #dep:mvn
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
-next=$(next-in-path mvn $0)
+$(next-in-path mvn $0) -gs $XDG_CONFIG_HOME/maven/settings.xml $@
-if (( $? != 0 )); then exit 1; fi
-$next -gs $XDG_CONFIG_HOME/maven/settings.xml $@

xdg-wrappers/node

@@ -1,12 +1,5 @@
 #!/bin/zsh
 #dep:node
-local SELF=$(realpath "$0")
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
 export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
-NEXT=$(next-in-path node $0)
+$(next-in-path node $0) $@
-if (( $? != 0 )); then exit 1; fi
-if [[ $NEXT == $SELF ]]; then
-	exec /usr/bin/node $@
-else
-	exec $NEXT $@
-fi

xdg-wrappers/npm

@@ -2,6 +2,4 @@
 #dep:npm
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
 export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
-next=$(next-in-path npm $0)
+$(next-in-path npm $0) $@
-if (( $? != 0 )); then exit 1; fi
-$next $@

xdg-wrappers/rg

@@ -5,6 +5,4 @@ RIPGREP_CONFIG_PATH=${XDG_CONFIG_HOME:-$HOME/.config}/ripgreprc
 if [[ -e $RIPGREP_CONFIG_PATH ]]; then
 	export RIPGREP_CONFIG_PATH
 fi
-next=$(next-in-path rg $0)
+$(next-in-path rg $0) $@
-if (( $? != 0 )); then exit 1; fi
-$next $@

xdg-wrappers/sbt

@@ -15,6 +15,4 @@ opts=(
 	"-Dsbt.override.build.repos=true"
 )
 export SBT_OPTS=${(j: :)opts}
-next=$(next-in-path sbt $0)
+$(next-in-path sbt $0) $@
-if (( $? != 0 )); then exit 1; fi
-$next $@

xdg-wrappers/steam

@@ -1,13 +1,32 @@
 #!/usr/bin/env bash
 #dep:steam
 
-#FAKEHOME=${XDG_DATA_HOME:-$HOME/.local/share}/steam
+FAKEHOME=${XDG_DATA_HOME:-$HOME/.local/share}/steam
-#echo "Starting Steam in faked home $FAKEHOME" >&2
+echo "Starting Steam in faked home $FAKEHOME" >&2
-#
+
-## If .steam exists in ~/ and not in the fake home, move it to the fake home
+# Symlink a file to the fake home
-#if [ -d $HOME/.steam ] && [ ! -d $FAKEHOME/.steam ]; then
+link_dir() {
-#	echo "migrating $HOME/.steam to $FAKEHOME" >&2
+	# Replace HOME with FAKEHOME in the link name
-#	mv $HOME/.steam $FAKEHOME/
+	link_name=$(echo $1 | sed "s|^$HOME|$FAKEHOME|")
-#fi
+
-#export HOME=$FAKEHOME
+	# Creates the link's parent directory and symlinks it
+	mkdir -p $(dirname $link_name)
+	if [ ! -d $link_name ]; then
+		echo "Linking $link_name" >&2
+		ln -s $1 $link_name
+	fi
+}
+
+mkdir -p $FAKEHOME
+
+link_dir $XDG_DATA_HOME   # ~/.local/share
+link_dir $XDG_CACHE_HOME  # ~/.cache
+link_dir $XDG_CONFIG_HOME # ~/.config
+
+# If .steam exists in ~/ and not in the fake home, move it to the fake home
+if [ -d $HOME/.steam ] && [ ! -d $FAKEHOME/.steam ]; then
+	echo "migrating $HOME/.steam to $FAKEHOME" >&2
+	mv $HOME/.steam $FAKEHOME/
+fi
+export HOME=$FAKEHOME
 exec /usr/bin/steam $@

xdg-wrappers/wget

@@ -1,6 +1,4 @@
 #!/bin/zsh
 #dep:wget
 source ${$(realpath "$0"):h:h}/lib/next-in-path.zsh
-next=$(next-in-path wget $0)
+$(next-in-path wget $0) --hsts-file="${XDG_DATA_HOME:-$HOME/.local/share}/wget-hsts" "$@"
-if (( $? != 0 )); then exit 1; fi
-$next --hsts-file="${XDG_DATA_HOME:-$HOME/.local/share}/wget-hsts" "$@"