From 626dc0018bb224da47bf41b12c787074caa9446f Mon Sep 17 00:00:00 2001
From: "Keith F. Kelly" <keith.f.kelly@outlook.com>
Date: Tue, 30 Nov 2021 12:03:02 -0800
Subject: [PATCH] Bluetooth script changes (#71)

---
 bluetooth_forget_all_pairings.sh |   2 +
 bluetooth_pair.sh                | 150 -------------------------------
 2 files changed, 2 insertions(+), 150 deletions(-)
 create mode 100644 bluetooth_forget_all_pairings.sh
 delete mode 100644 bluetooth_pair.sh

diff --git a/bluetooth_forget_all_pairings.sh b/bluetooth_forget_all_pairings.sh
new file mode 100644
index 0000000..9ff94f8
--- /dev/null
+++ b/bluetooth_forget_all_pairings.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/S45bluetooth renew
diff --git a/bluetooth_pair.sh b/bluetooth_pair.sh
deleted file mode 100644
index 140b9c9..0000000
--- a/bluetooth_pair.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Original script by Alexey "Sorgelig" Melnikov https://github.com/MiSTer-devel/Main_MiSTer/wiki
-# Copyright 2019 Alessandro "Locutus73" Miele
-
-# You can download the latest version of this script from:
-# https://github.com/MiSTer-devel/Scripts_MiSTer
-
-
-
-# Version 2.0 - 2021-08-30 - Tests if executed on a 5.X Kernel system (thanks to MiSTer Addons for the help with testing).
-# Version 1.0 - 2019-10-26 - First commit.
-
-
-
-# ========= OPTIONS ==================
-
-# ========= ADVANCED OPTIONS =========
-
-DIALOG_HEIGHT="31"
-
-# ========= CODE STARTS HERE =========
-
-KERNEL_VERSION="$(uname -r)"
-KERNEL_VERSION="${KERNEL_VERSION%%-*}"
-if [[ "${KERNEL_VERSION}" > "5.0.0" ]]
-then
-	/sbin/btpair
-	exit 0
-fi
-
-function checkTERMINAL {
-#	if [ "$(uname -n)" != "MiSTer" ]
-#	then
-#		echo "This script must be run"
-#		echo "on a MiSTer system."
-#		exit 1
-#	fi
-	if [[ ! (-t 0 && -t 1 && -t 2) ]]
-	then
-		echo "This script must be run"
-		echo "from an interactive terminal."
-		echo "Please press F9 (F12 to exit)"
-		echo "or use SSH."
-		exit 2
-	fi
-}
-
-function setupDIALOG {
-	DIALOG="dialog"
-
-	
-	export NCURSES_NO_UTF8_ACS=1
-	
-	: ${DIALOG_OK=0}
-	: ${DIALOG_CANCEL=1}
-	: ${DIALOG_HELP=2}
-	: ${DIALOG_EXTRA=3}
-	: ${DIALOG_ITEM_HELP=4}
-	: ${DIALOG_ESC=255}
-
-	: ${SIG_NONE=0}
-	: ${SIG_HUP=1}
-	: ${SIG_INT=2}
-	: ${SIG_QUIT=3}
-	: ${SIG_KILL=9}
-	: ${SIG_TERM=15}
-}
-
-function setupDIALOGtempfile {
-	DIALOG_TEMPFILE=`(DIALOG_TEMPFILE) 2>/dev/null` || DIALOG_TEMPFILE=/tmp/dialog_tempfile$$
-	trap "rm -f $DIALOG_TEMPFILE" 0 $SIG_NONE $SIG_HUP $SIG_INT $SIG_QUIT $SIG_TERM
-}
-
-function readDIALOGtempfile {
-	DIALOG_RETVAL=$?
-	DIALOG_OUTPUT="$(cat ${DIALOG_TEMPFILE})"
-	#rm -f ${DIALOG_TEMPFILE}
-	#unset DIALOG_TEMPFILE
-}
-
-
-checkTERMINAL
-
-echo Switch input device
-echo to pairing mode.
-echo searching...
-echo
-
-MAC_NAMES=$(hcitool scan --flush | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}.*')
-if [ ! -z "${MAC_NAMES}" ]; then
-	OLD_IFS="$IFS"
-	IFS=$'\n'
-	for MAC_NAME in ${MAC_NAMES}; do
-		MAC=$(echo "${MAC_NAME}" | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
-		NAME=$(echo "${MAC_NAME}" | sed 's/[^ 	]*[ 	]*//')
-		MENU_ITEMS="${MENU_ITEMS} \"${MAC}\" \"${NAME}\""
-	done
-	IFS="$OLD_IFS"
-	
-	setupDIALOG
-	setupDIALOGtempfile
-	eval ${DIALOG} --clear --colors --ok-label \"Pair\" \
-		--title \"Bluetooth pair\" \
-		${ADDITIONAL_OPTIONS} \
-		--menu \"Please select the Controller/Keyboard/Mouse you want to pair.\" ${DIALOG_HEIGHT} 0 999 \
-		${MENU_ITEMS} \
-		2> ${DIALOG_TEMPFILE}
-	readDIALOGtempfile
-	
-	case ${DIALOG_RETVAL} in
-		${DIALOG_OK})
-			MAC="${DIALOG_OUTPUT}"
-			;;
-		*)
-			exit 1
-			;;
-	esac
-fi
-
-if [ ! -z "${MAC}" ]; then
-	echo Got device: $MAC
-	echo Pairing...
-	echo
-	pair-agent hci0 $MAC
-	echo Add to trust list...
-	MAC=$(echo $MAC | sed -e 's/:/_/g')
-	BTADAPTER=`dbus-send --system --dest=org.bluez --print-reply / org.bluez.Manager.DefaultAdapter | tail -1 | sed 's/^.*"\(.*\)".*$/\1/'`
-	dbus-send --system --dest=org.bluez --print-reply $BTADAPTER/dev_$MAC org.bluez.Device.SetProperty string:Trusted variant:boolean:true >/dev/nul
-	echo Connecting...
-	dbus-send --system --dest=org.bluez --print-reply $BTADAPTER/dev_$MAC org.bluez.Input.Connect >/dev/nul
-	echo Done.
-	exit 0
-else
-	echo nothing found.
-	exit 1
-fi