- Updated copy on gui folder for FreeBSD to copy correctly

system-config/dename.sh

@@ -1,4 +1,36 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+unamestr=$(uname)
+if [ "$unamestr" = 'FreeBSD' ]; then
+
+	DESKTOP="unknown"
+
+	ps -aux | grep -E '[s]tart-hello'
+	if [ $? -ne 1 ];then
+		echo "hellosystem"
+		exit 0
+	fi
+
+	ps -aux | grep -E '[o]penbox'
+	if [ $? -ne 1 ];then
+		echo "openbox"
+		exit 0
+	fi
+
+	ps -aux | grep -E '[m]ate-panel'
+	if [ $? -ne 1 ];then
+		echo "mate"
+		exit 0
+	fi
+
+	ps -aux | grep -E '[x]fce4-session'
+	if [ $? -ne 1 ];then
+		echo "xfce"
+		exit 0
+	fi
+
+fi
+
 
 function detect_budgie()
 {

system-config/unipkg.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if pkgmgr="$( which apt-get )" 2> /dev/null; then
    echo "Debian"

xkeysnail-config/gnome_logoff.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 dbus-monitor --session "type='signal',interface='org.gnome.SessionManager.Logout'" | grep '1' |
 while read x; do
   # echo "$x"

xkeysnail-config/killdups.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 xkeycount=$(pgrep 'xkeysnail' | wc -l)
 

xkeysnail-config/prexk.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if [ -f {homedir}/.config/systemd/user/keyswap.timer ]; then
 	systemctl --user stop keyswap.timer >/dev/null 2>&1
 	systemctl --user disable keyswap.timer >/dev/null 2>&1

xkeysnail-config/root_logoff.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # /usr/local/bin/logoff.sh
 while true; do
   w | grep -E "$1.*$2" > /dev/null 2>&1 || (sudo systemctl stop xkeysnail && sudo pkill -f logoff)

xkeysnail-config/xkeystart.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # >/dev/null 2>&1
 
 if [ -f /usr/local/bin/xkeysnail ];then

xkeysnail_service.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # set about:config?filter=ui.key.menuAccessKeyFocuses
 # to false for wordwise to work in Firefox
@@ -327,9 +327,13 @@ expsh=" "
 # 	sudo ./system-config/unipkg.sh inotify-tools
 # fi
 if ! [ -x "$(command -v pip3)" ]; then
+	if [ "$distro" == "freebsd" ]; then
+		sudo python3 -m ensurepip
+	else
 		echo "Will need to install python3-pip..."
 		sudo ./system-config/unipkg.sh python3-pip
 	fi
+fi
 if ! [ -x "$(command -v python3-config)" ]; then
 	if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
 		pydev="python3-dev"
@@ -380,7 +384,7 @@ yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/kinto/xkeysnail.desk
 echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version
 yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new
 yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new
-yes | cp -rf ./xkeysnail-config/gui/ ~/.config/kinto/
+yes | cp -rf ./xkeysnail-config/gui/ ~/.config/kinto/gui
 yes | cp -nrf ./xkeysnail-config/initkb ~/.config/kinto/initkb
 yes | cp -rf ./xkeysnail-config/killdups.sh ~/.config/kinto/killdups.sh
 yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py