From 05899885df82513c3269c5abdc4f5e55cf951817 Mon Sep 17 00:00:00 2001
From: nogal <shrimpcracker89@gmail.com>
Date: Tue, 14 May 2013 00:08:21 -0400
Subject: [PATCH] made sure duplicates were removed from the remote git repo

---
 game.sh                      |  5 ++++
 modules/amnesia.sh           | 12 +++------
 modules/braid.sh             |  5 ++++
 modules/gamescript_v_4.sh.sh | 49 ------------------------------------
 modules/limbo.sh             |  5 ++++
 modules/lonesurvivor.sh      |  5 ++++
 modules/minecraft.sh         |  5 ++++
 modules/minecraft.xboxdrv~   | 41 ------------------------------
 modules/psychonauts.sh       |  5 ++++
 modules/psychonauts.sh~      |  6 -----
 modules/psychonauts.xboxdrv~ | 41 ------------------------------
 modules/xpad.sh              |  9 +------
 modules/xpad.sh~             | 16 ------------
 13 files changed, 35 insertions(+), 169 deletions(-)
 delete mode 100755 modules/gamescript_v_4.sh.sh
 delete mode 100644 modules/minecraft.xboxdrv~
 delete mode 100755 modules/psychonauts.sh~
 delete mode 100644 modules/psychonauts.xboxdrv~
 delete mode 100755 modules/xpad.sh~

diff --git a/game.sh b/game.sh
index 27ea168..2966a97 100755
--- a/game.sh
+++ b/game.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This is a script designed to switch between several preconfigured layouts as defined by the xboxdrv settings held within modules.
+
+# Give a list of available games
 echo What game would you like to play?
 echo 1\) Amnesia
 echo 2\) Braid
@@ -10,6 +13,8 @@ echo "99) None, give me my gamepad mode back."
 echo
 read userinput
 echo
+
+# Use basic logic to determine which module to load
 if [ "$userinput" == 1 -o "$userinput" == "Amnesia" -o "$userinput" == "amnesia" ]
 then echo "Your controller will now be configured for Amnesia."
 echo
diff --git a/modules/amnesia.sh b/modules/amnesia.sh
index 43b62ab..f88c010 100755
--- a/modules/amnesia.sh
+++ b/modules/amnesia.sh
@@ -1,15 +1,11 @@
 #!/bin/bash
 
-# sudo rmmod xpad && sudo xboxdrv -c amnesia.xboxdrv -s
-
-# exit
-
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c amnesia.xboxdrv -s
-# module=usbcore; 
-# if modinfo "$module" >/dev/null 2>&1; 
-# then echo yes; 
-# else echo no; fi
diff --git a/modules/braid.sh b/modules/braid.sh
index 6aaf94b..24dd3e0 100755
--- a/modules/braid.sh
+++ b/modules/braid.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c braid.xboxdrv -s
diff --git a/modules/gamescript_v_4.sh.sh b/modules/gamescript_v_4.sh.sh
deleted file mode 100755
index 27ea168..0000000
--- a/modules/gamescript_v_4.sh.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-echo What game would you like to play?
-echo 1\) Amnesia
-echo 2\) Braid
-echo 3\) Limbo
-echo 4\) Lone Survivor
-echo 5\) Minecraft
-echo 6\) Psychonauts
-echo "99) None, give me my gamepad mode back."
-echo
-read userinput
-echo
-if [ "$userinput" == 1 -o "$userinput" == "Amnesia" -o "$userinput" == "amnesia" ]
-then echo "Your controller will now be configured for Amnesia."
-echo
-cd modules 
-./amnesia.sh
-elif [ "$userinput" == 2 -o "$userinput" == "Braid" -o "$userinput" == "braid" ]
-then echo "Your controller will now be configured for Braid."
-echo
-cd modules 
-./braid.sh
-elif [ "$userinput" == 3 -o "$userinput" == "Limbo" -o "$userinput" == "limbo" ]
-then echo "Your controller will now be configured for Limbo."
-echo
-cd modules 
-./limbo.sh
-elif [ "$userinput" == 4 -o "$userinput" == "Lone Survivor" -o "$userinput" == "lone survivor" ]
-then echo "Your controller will now be configured for Lone Survivor"
-echo
-cd modules 
-./lonesurvivor.sh
-elif [ "$userinput" == 5 -o "$userinput" == "Minecraft" -o "$userinput" == "minecraft" ]
-then echo "Your controller will now be configured for Minecraft."
-echo
-cd modules 
-./minecraft.sh
-elif [ "$userinput" == 6 -o "$userinput" == "Psychonauts" -o "$userinput" == "psychonauts" ]
-then echo "Your controller will now be configured for Psychonauts."
-echo
-cd modules 
-./psychonauts.sh
-elif [ "$userinput" == 99 ]
-then echo "Your controller will now be returned to a normal gamepad."
-cd modules
-./xpad.sh
-else echo That is not a valid choice.
-echo
-fi
diff --git a/modules/limbo.sh b/modules/limbo.sh
index 026eee6..e8dbb70 100755
--- a/modules/limbo.sh
+++ b/modules/limbo.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c limbo.xboxdrv -s
diff --git a/modules/lonesurvivor.sh b/modules/lonesurvivor.sh
index adba747..6113863 100755
--- a/modules/lonesurvivor.sh
+++ b/modules/lonesurvivor.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c lonesurvivor.xboxdrv -s
diff --git a/modules/minecraft.sh b/modules/minecraft.sh
index 83468c4..f777013 100755
--- a/modules/minecraft.sh
+++ b/modules/minecraft.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c minecraft.xboxdrv -s
diff --git a/modules/minecraft.xboxdrv~ b/modules/minecraft.xboxdrv~
deleted file mode 100644
index a1eed86..0000000
--- a/modules/minecraft.xboxdrv~
+++ /dev/null
@@ -1,41 +0,0 @@
-[xboxdrv]
-ui-clear=true
-trigger-as-button = true
-
-[ui-axismap]
-x1=KEY_A:KEY_D
-y1=KEY_W:KEY_S
-x2^dead:6000 = REL_X:750:-1
-y2^dead:6000 = REL_Y:750:-1
-
-# trigger^invert = rel-repeat:REL_WHEEL:1:50
-
-[ui-buttonmap]
-a = KEY_SPACE
-b = KEY_LEFTSHIFT
-x = KEY_Q
-y = KEY_T
-lt = BTN_RIGHT
-rt = BTN_LEFT
-
-rb = KEY_A
-lb = KEY_D
-
-# tl = KEY_BACKSPACE
-tr = KEY_LEFTALT
-
-[ui-buttonmap]
-du = rel:REL_WHEEL:-1:500
-dr = rel:REL_WHEEL:-1:500
-dd = rel:REL_WHEEL:1:500
-dl = rel:REL_WHEEL:1:500
-
-# lt = KEY_VOLUMEDOWN
-# rt = KEY_VOLUMEUP
-
-[ui-buttonmap]
-start = KEY_E
-back  = KEY_ESC
-guide = KEY_TAB
-
-# EOF #
diff --git a/modules/psychonauts.sh b/modules/psychonauts.sh
index f367e4b..993dc57 100755
--- a/modules/psychonauts.sh
+++ b/modules/psychonauts.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+# Define the default gamepad module name
 module=xpad
+
+# Check if the module is already loaded, if so, remove it and run the xboxdrv module
 if lsmod | grep -q "^$module "
 then sudo rmmod xpad
 fi
+
 sudo xboxdrv -c psychonauts.xboxdrv -s
diff --git a/modules/psychonauts.sh~ b/modules/psychonauts.sh~
deleted file mode 100755
index 83468c4..0000000
--- a/modules/psychonauts.sh~
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-module=xpad
-if lsmod | grep -q "^$module "
-then sudo rmmod xpad
-fi
-sudo xboxdrv -c minecraft.xboxdrv -s
diff --git a/modules/psychonauts.xboxdrv~ b/modules/psychonauts.xboxdrv~
deleted file mode 100644
index 0b64e91..0000000
--- a/modules/psychonauts.xboxdrv~
+++ /dev/null
@@ -1,41 +0,0 @@
-[xboxdrv]
-ui-clear=true
-trigger-as-button = true
-
-[ui-axismap]
-x1=KEY_A:KEY_D
-y1=KEY_W:KEY_S
-x2^dead:6000 = REL_X:750:-1
-y2^dead:6000 = REL_Y:750:-1
-
-# trigger^invert = rel-repeat:REL_WHEEL:1:50
-
-[ui-buttonmap]
-a = KEY_SPACE
-b = KEY_LEFTCTRL
-x = KEY_TAB
-y = KEY_F
-lt = BTN_RIGHT
-rt = BTN_LEFT
-
-rb = KEY_E
-lb = KEY_Q
-
-tl = KEY_LEFTSHIFT
-tr = KEY_R
-
-[ui-buttonmap]
-du = KEY_J
-dr = KEY_N
-dd = KEY_X
-dl = KEY_M
-
-# lt = KEY_VOLUMEDOWN
-# rt = KEY_VOLUMEUP
-
-[ui-buttonmap]
-start = KEY_ESC
-back  = KEY_TAB
-# guide = KEY_RESERVED
-
-# EOF #
diff --git a/modules/xpad.sh b/modules/xpad.sh
index 20f4e7f..ed73b19 100755
--- a/modules/xpad.sh
+++ b/modules/xpad.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# sudo rmmod xpad && sudo xboxdrv -c amnesia.xboxdrv -s
-
-# exit
-
+# Check if the gamepad module is loaded, if not, load it.
 module=xpad
 if lsmod | grep -q "^$module "
 then echo "Xpad already loaded."
@@ -11,7 +8,3 @@ else echo "Controller has been returned to normal function."
 sudo modprobe xpad
 echo
 fi
-# module=usbcore; 
-# if modinfo "$module" >/dev/null 2>&1; 
-# then echo yes; 
-# else echo no; fi
diff --git a/modules/xpad.sh~ b/modules/xpad.sh~
deleted file mode 100755
index 1eced26..0000000
--- a/modules/xpad.sh~
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# sudo rmmod xpad && sudo xboxdrv -c amnesia.xboxdrv -s
-
-# exit
-
-module=xpad
-if lsmod | grep -q "^$module "
-then echo "Xpad already loaded."
-else echo "Controller has been returned to normal function."
-sudo modprobe xpad
-fi
-# module=usbcore; 
-# if modinfo "$module" >/dev/null 2>&1; 
-# then echo yes; 
-# else echo no; fi
-- 
GitLab