drop /usr/local/bin/default*

woof-code/packages-templates/connman-gtk_FIXUPHACK

@@ -1,13 +1,8 @@
-cat << EOF > pinstall.sh
-echo -e '#!/bin/sh\nexec connman-gtk' > usr/local/bin/defaultconnect
-chmod 755 usr/local/bin/defaultconnect
-
-cat << EOF2 > usr/local/bin/connman-gtk
+cat << EOF > usr/local/bin/connman-gtk
 #!/bin/sh
 
 gsettings set net.connman.gtk launch-to-tray false
 
 exec /usr/bin/connman-gtk "\\\$@"
-EOF2
-chmod 755 usr/local/bin/connman-gtk
 EOF
+chmod 755 usr/local/bin/connman-gtk

woof-code/packages-templates/geany_FIXUPHACK

@@ -1,12 +1,4 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec geany "\$@"' > usr/local/bin/defaulttexteditor
-chmod 755 usr/local/bin/defaulttexteditor
-
-echo '#!/bin/sh
-exec geany "\$@"' > usr/local/bin/defaulthtmleditor
-chmod 755 usr/local/bin/defaulthtmleditor
-
 for T in \`grep ^MimeType= usr/share/applications/geany.desktop | sed -e s/^MimeType=//g -e 's/;/ /g'\`; do
 	[ "\$T" = "text/plain" ] && continue
 	chroot . xdg-mime default geany.desktop \$T

woof-code/packages-templates/gsimplecal_FIXUPHACK

@@ -1,14 +1,9 @@
-mkdir -p etc/xdg/gsimplecal
-cat << EOF > etc/xdg/gsimplecal/config
+mkdir -p etc/skel/.config/gsimplecal
+cat << EOF > etc/skel/.config/gsimplecal/config
 show_timezones = 1
 close_on_unfocus = 1
 clock_format = %A, %d %B %Y, %H:%M
 clock_label =
 clock_tz =
 EOF
-
-cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec gsimplecal "\$@"' > usr/local/bin/defaultcalendar
-chmod 755 usr/local/bin/defaultcalendar
-EOF
+chmod 644 etc/skel/.config/gsimplecal/config

woof-code/packages-templates/l3afpad_FIXUPHACK

@@ -1,8 +1,4 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec l3afpad "\$@"' > usr/local/bin/defaulttextviewer
-chmod 755 usr/local/bin/defaulttextviewer
-
 chroot . xdg-mime default l3afpad.desktop text/plain
 chroot . run-as-spot xdg-mime default l3afpad.desktop text/plain
 EOF

woof-code/packages-templates/lxtask_FIXUPHACK

@@ -1,8 +1,4 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec lxtask "\$@"' > usr/local/bin/defaultprocessmanager
-chmod 755 usr/local/bin/defaultprocessmanager
-
 echo '[General]
 show_other_tasks=1' > etc/skel/.config/lxtask.conf
 EOF

woof-code/packages-templates/mpv_FIXUPHACK

@@ -1,10 +1,3 @@
-cat << EOF > pinstall.sh
-echo '#!/bin/ash
-[ \$# -eq 0 ] && exec mpv --player-operation-mode=pseudo-gui
-exec mpv "\$@"' > usr/local/bin/defaultmediaplayer
-chmod 755 usr/local/bin/defaultmediaplayer
-EOF
-
 cat << EOF > usr/bin/mpv-webcam
 #!/bin/sh
 

woof-code/packages-templates/viewnior_FIXUPHACK

@@ -1,8 +1,4 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec viewnior "\$@"' > usr/local/bin/defaultimageviewer
-chmod 755 usr/local/bin/defaultimageviewer
-
 for T in \`grep ^MimeType= usr/share/applications/viewnior.desktop | sed -e s/^MimeType=//g -e 's/;/ /g'\`; do
 	[ "\$T" = "image/bmp" ] && continue
 	chroot . xdg-mime default viewnior.desktop \$T

woof-code/packages-templates/waybar_FIXUPHACK

@@ -90,13 +90,13 @@ cat << EOF > etc/skel/.config/waybar/presets/Horizontal/config.jsonc
 		"format": "\uf07b",
 		"tooltip-format": "File manager",
 		"interval": "once",
-		"on-click": "defaultfilemanager"
+		"on-click": "spacefm"
 	},
 	"custom/browser": {
 		"format": "\uf0ac",
 		"tooltip-format": "Web browser",
 		"interval": "once",
-		"on-click": "defaultbrowser"
+		"on-click": "x-www-browser"
 	},
 	"custom/terminal": {
 		"format": "\uf120",
@@ -108,31 +108,31 @@ cat << EOF > etc/skel/.config/waybar/presets/Horizontal/config.jsonc
 		"format": "\uf085",
 		"tooltip-format": "Task manager",
 		"interval": "once",
-		"on-click": "defaultprocessmanager"
+		"on-click": "lxtask"
 	},
 	"custom/texteditor": {
 		"format": "\uf044",
 		"tooltip-format": "Text editor",
 		"interval": "once",
-		"on-click": "defaulttexteditor"
+		"on-click": "geany"
 	},
 	"custom/imageeditor": {
 		"format": "\uf1fc",
 		"tooltip-format": "Image editor",
 		"interval": "once",
-		"on-click": "defaultimageeditor"
+		"on-click": "mtpaint"
 	},
 	"custom/wordprocessor": {
 		"format": "\uf15c",
 		"tooltip-format": "Word processor",
 		"interval": "once",
-		"on-click": "defaultwordprocessor"
+		"on-click": "abiword"
 	},
 	"custom/spreadsheet": {
 		"format": "\uf0ce",
 		"tooltip-format": "Spreadsheet",
 		"interval": "once",
-		"on-click": "defaultspreadsheet"
+		"on-click": "gnumeric"
 	},
 	"custom/help": {
 		"format": "\uf1cd",
@@ -272,13 +272,13 @@ cat << EOF > etc/skel/.config/waybar/presets/Vertical/config.jsonc
 		"format": "\uf07b",
 		"tooltip-format": "File manager",
 		"interval": "once",
-		"on-click": "defaultfilemanager"
+		"on-click": "spacefm"
 	},
 	"custom/browser": {
 		"format": "\uf0ac",
 		"tooltip-format": "Web browser",
 		"interval": "once",
-		"on-click": "defaultbrowser"
+		"on-click": "x-www-browser"
 	},
 	"custom/terminal": {
 		"format": "\uf120",
@@ -290,31 +290,31 @@ cat << EOF > etc/skel/.config/waybar/presets/Vertical/config.jsonc
 		"format": "\uf085",
 		"tooltip-format": "Task manager",
 		"interval": "once",
-		"on-click": "defaultprocessmanager"
+		"on-click": "lxtask"
 	},
 	"custom/texteditor": {
 		"format": "\uf044",
 		"tooltip-format": "Text editor",
 		"interval": "once",
-		"on-click": "defaulttexteditor"
+		"on-click": "geany"
 	},
 	"custom/imageeditor": {
 		"format": "\uf1fc",
 		"tooltip-format": "Image editor",
 		"interval": "once",
-		"on-click": "defaultimageeditor"
+		"on-click": "mtpaint"
 	},
 	"custom/wordprocessor": {
 		"format": "\uf15c",
 		"tooltip-format": "Word processor",
 		"interval": "once",
-		"on-click": "defaultwordprocessor"
+		"on-click": "abiword"
 	},
 	"custom/spreadsheet": {
 		"format": "\uf0ce",
 		"tooltip-format": "Spreadsheet",
 		"interval": "once",
-		"on-click": "defaultspreadsheet"
+		"on-click": "gnumeric"
 	},
 	"custom/help": {
 		"format": "\uf1cd",

woof-code/packages-templates/weechat_FIXUPHACK

@@ -1,33 +1,9 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec x-terminal-emulator -e weechat' > usr/local/bin/weechat-shell
-chmod 755 usr/local/bin/weechat-shell
-
-echo '#!/bin/sh
-exec weechat-shell' > usr/local/bin/defaultchat
-chmod 755 usr/local/bin/defaultchat
-
 chroot . run-as-spot weechat-headless -r '/set irc.server_default.msg_part \"\";/set irc.server_default.msg_quit \"\";/quit'
 chroot . run-as-spot weechat-headless -r '/set irc.ctcp.clientinfo \"\";/set irc.ctcp.finger \"\";/set irc.ctcp.source \"\";/set irc.ctcp.time \"\";/set irc.ctcp.userinfo \"\";/set irc.ctcp.version \"\";/quit'
 chroot . run-as-spot weechat-headless -r '/server add libera irc.libera.chat/6697 -autoconnect -ssl;/set irc.server.libera.autojoin #puppylinux;/quit'
 
 rm -rf home/spot/.cache/weechat home/spot/.local/share/weechat home/spot/.local/state/weechat
 chown -R root:root home/spot/.config/weechat
 mv home/spot/.config/weechat etc/skel/.config/
-
-if [ ! -e usr/share/applications/weechat.desktop ]; then
-	cat << EOF2 > usr/share/applications/weechat.desktop
-[Desktop Entry]
-Name=WeeChat
-GenericName=Chat client
-Comment=Extensible chat client
-Exec=weechat %u
-Terminal=true
-Icon=weechat
-Type=Application
-Categories=Network;Chat;IRCClient;ConsoleOnly;
-MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
-EOF2
-	chmod 644 usr/share/applications/weechat.desktop
-fi
 EOF

woof-code/packages-templates/xarchiver_FIXUPHACK

@@ -1,8 +1,4 @@
 cat << EOF > pinstall.sh
-echo '#!/bin/sh
-exec xarchiver "\$@"' > usr/local/bin/defaultarchiver
-chmod 755 usr/local/bin/defaultarchiver
-
 for T in \`grep ^MimeType= usr/share/applications/xarchiver.desktop | sed -e s/^MimeType=//g -e 's/;/ /g'\`; do
 	chroot . xdg-mime default xarchiver.desktop \$T
 	chroot . run-as-spot xdg-mime default xarchiver.desktop \$T

woof-code/rootfs-petbuilds/deadbeef/pinstall.sh

@@ -1,11 +1,3 @@
-echo '#!/bin/sh
-exec deadbeef "$@"' > usr/local/bin/defaultaudioplayer
-chmod 755 usr/local/bin/defaultaudioplayer
-
-echo '#!/bin/sh
-exec deadbeef all.cda' > usr/local/bin/defaultcdplayer
-chmod 755 usr/local/bin/defaultcdplayer
-
 if [ ! -e usr/local/apps/ROX-Filer/AppRun ]; then
 	for T in `grep ^MimeType= usr/local/share/applications/deadbeef.desktop | sed -e s/^MimeType=//g -e 's/;/ /g'`; do
 		chroot . xdg-mime default deadbeef.desktop $T

woof-code/rootfs-petbuilds/dwl/config.h

@@ -119,17 +119,17 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
 
 /* commands */
 static const char *termcmd[] = { "footclient", NULL };
-static const char *runcmd[] = { "defaultrun", NULL };
+static const char *runcmd[] = { "gexec", NULL };
 static const char *lockcmd[] = { "swaylock", NULL };
 static const char *menucmd[] = { "tofi-exec", NULL };
 static const char *brightnessupcmd[] = { "brightnessctl", "set", "+10%", NULL };
 static const char *brightnessdowncmd[] = { "brightnessctl", "set", "10%-", NULL };
 static const char *volumeupcmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "1%+", NULL };
 static const char *volumedowncmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "1%-", NULL };
 static const char *mutecmd[] = { "wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "toggle", NULL };
-static const char *screenshotcmd[] = { "defaultscreenshot", NULL };
+static const char *screenshotcmd[] = { "screenshot", "full", NULL };
 static const char *regionscreenshotcmd[] = { "screenshot", "region", NULL };
-static const char *browsercmd[] = { "defaultbrowser", NULL };
+static const char *browsercmd[] = { "x-www-browser", NULL };
 
 static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */

woof-code/rootfs-petbuilds/epdfview/pinstall.sh

@@ -1,7 +1,3 @@
-echo '#!/bin/sh
-exec epdfview "$@"' > usr/local/bin/defaultpdfviewer
-chmod 755 usr/local/bin/defaultpdfviewer
-
 if [ ! -e usr/local/apps/ROX-Filer/AppRun ]; then
 	chroot . xdg-mime default epdfview.desktop application/pdf
 	chroot . run-as-spot xdg-mime default epdfview.desktop application/pdf

woof-code/rootfs-petbuilds/labwc-puppy/etc/skel/.config/labwc/rc.xml

@@ -74,7 +74,7 @@
     </keybind>
 
     <keybind key="Print">
-      <action name="Execute"><command>defaultscreenshot</command></action>
+      <action name="Execute"><command>screenshot full</command></action>
     </keybind>
 
     <keybind key="S-Print">
@@ -90,35 +90,35 @@
     </keybind>
 
     <keybind key="A-F2">
-      <action name="Execute"><command>defaultrun</command></action>
+      <action name="Execute"><command>gexec</command></action>
     </keybind>
 
     <keybind key="W-l">
       <action name="Execute"><command>swaylock</command></action>
     </keybind>
 
     <keybind key="W-r">
-      <action name="Execute"><command>defaultrun</command></action>
+      <action name="Execute"><command>gexec</command></action>
     </keybind>
 
     <keybind key="W-e">
-      <action name="Execute"><command>defaultfilemanager</command></action>
+      <action name="Execute"><command>spacefm</command></action>
     </keybind>
 
     <keybind key="W-w">
-      <action name="Execute"><command>defaultbrowser</command></action>
+      <action name="Execute"><command>x-www-browser</command></action>
     </keybind>
 
     <keybind key="C-A-t">
       <action name="Execute"><command>footclient</command></action>
     </keybind>
 
     <keybind key="C-A-Delete">
-      <action name="Execute"><command>defaultprocessmanager</command></action>
+      <action name="Execute"><command>lxtask</command></action>
     </keybind>
 
     <keybind key="C-S-Escape">
-      <action name="Execute"><command>defaultprocessmanager</command></action>
+      <action name="Execute"><command>lxtask</command></action>
     </keybind>
   </keyboard>
 

woof-code/rootfs-petbuilds/mtpaint/pinstall.sh

@@ -1,7 +1,3 @@
-echo '#!/bin/sh
-exec mtpaint "$@"' > usr/local/bin/defaultimageeditor
-chmod 755 usr/local/bin/defaultimageeditor
-
 if [ ! -e usr/local/apps/ROX-Filer/AppRun ]; then
 	chroot . xdg-mime default mtpaint.desktop image/bmp
 	chroot . run-as-spot xdg-mime default mtpaint.desktop image/bmp

woof-code/rootfs-petbuilds/spacefm/pinstall.sh

@@ -1,8 +1,2 @@
-echo '#!/bin/sh
-exec spacefm "$@"' > usr/local/bin/defaultfilemanager
-chmod 755 usr/local/bin/defaultfilemanager
-
-echo none > etc/desktop_app
-
 chroot . xdg-mime default spacefm.desktop inode/directory
 chroot . run-as-spot xdg-mime default spacefm.desktop inode/directory

woof-code/rootfs-petbuilds/yambar-dwl/etc/skel/.config/yambar/config.yml

@@ -72,7 +72,7 @@ bar:
     - pipewire:
         content:
           map:
-            on-click: defaultaudiomixer
+            on-click: pavucontrol
             conditions:
               type == "sink":
                 map:
@@ -105,7 +105,7 @@ bar:
         path: /usr/local/bin/netmon
         content:
           map:
-            on-click: defaultconnect
+            on-click: connman-gtk
             conditions:
               state == ready: {string: {text: "\uf0c1 {state}"}}
               state != ready: {string: {text: "\uf127 {state}"}}