From cbfcd8416a0a531b538b797532a6a9a398ad9063 Mon Sep 17 00:00:00 2001
From: Daniel Pavel <daniel.pavel@gmail.com>
Date: Thu, 11 Oct 2012 18:50:10 +0300
Subject: [PATCH] re-organized the directories a bit

---
 bin/hidconsole                                      |   7 +++++++
 bin/solaar                                          |  12 ++++++++++++
 bin/ur_scanner                                      |   7 +++++++
 lib/hidapi/hidconsole.py                            |   2 +-
 {resources => share}/README                         |   0
 .../icons/hicolor/128x128/apps/Solaar-fail.png      | Bin
 .../icons/hicolor/128x128/apps/Solaar.png           | Bin
 .../hicolor/128x128/devices/Unifying Receiver.png   | Bin
 .../devices/Wireless Solar Keyboard K750.png        | Bin
 .../icons/hicolor/128x128/status/battery_00.png     | Bin
 .../icons/hicolor/128x128/status/battery_100.png    | Bin
 .../icons/hicolor/128x128/status/battery_20.png     | Bin
 .../icons/hicolor/128x128/status/battery_40.png     | Bin
 .../icons/hicolor/128x128/status/battery_60.png     | Bin
 .../icons/hicolor/128x128/status/battery_80.png     | Bin
 .../hicolor/128x128/status/battery_unknown.png      | Bin
 .../icons/hicolor/128x128/status/light_00.png       | Bin
 .../icons/hicolor/128x128/status/light_100.png      | Bin
 .../icons/hicolor/128x128/status/light_20.png       | Bin
 .../icons/hicolor/128x128/status/light_40.png       | Bin
 .../icons/hicolor/128x128/status/light_60.png       | Bin
 .../icons/hicolor/128x128/status/light_80.png       | Bin
 .../icons/hicolor/128x128/status/light_unknown.png  | Bin
 solaar                                              |  12 ------------
 tools/hidconsole                                    |  10 ----------
 tools/ur_scanner                                    |  10 ----------
 26 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100755 bin/hidconsole
 create mode 100755 bin/solaar
 create mode 100755 bin/ur_scanner
 rename {resources => share}/README (100%)
 rename {resources => share}/icons/hicolor/128x128/apps/Solaar-fail.png (100%)
 rename {resources => share}/icons/hicolor/128x128/apps/Solaar.png (100%)
 rename {resources => share}/icons/hicolor/128x128/devices/Unifying Receiver.png (100%)
 rename {resources => share}/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_00.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_100.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_20.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_40.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_60.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_80.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/battery_unknown.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_00.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_100.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_20.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_40.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_60.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_80.png (100%)
 rename {resources => share}/icons/hicolor/128x128/status/light_unknown.png (100%)
 delete mode 100755 solaar
 delete mode 100755 tools/hidconsole
 delete mode 100755 tools/ur_scanner

diff --git a/bin/hidconsole b/bin/hidconsole
new file mode 100755
index 00000000..2cdda26a
--- /dev/null
+++ b/bin/hidconsole
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+LIB=`dirname "$0"`/../lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`uname -m`
+export PYTHONPATH=$LIB
+
+exec python -OO -u -m hidapi.hidconsole "$@"
diff --git a/bin/solaar b/bin/solaar
new file mode 100755
index 00000000..69029b44
--- /dev/null
+++ b/bin/solaar
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+APP=`dirname "$0"`/../app
+LIB=`dirname "$0"`/../lib
+SHARE=`dirname "$0"`/../share
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`uname -m`
+export PYTHONPATH=$APP:$LIB
+export XDG_DATA_DIRS=$SHARE:$XDG_DATA_DIRS
+
+exec python -OO -m solaar "$@"
+#exec python -OO -m profile -o $TMPDIR/profile.log app/solaar.py "$@"
diff --git a/bin/ur_scanner b/bin/ur_scanner
new file mode 100755
index 00000000..202049fb
--- /dev/null
+++ b/bin/ur_scanner
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+LIB=`dirname "$0"`/../lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`uname -m`
+export PYTHONPATH=$LIB
+
+exec python -OO -m logitech.ur_scanner "$@"
diff --git a/lib/hidapi/hidconsole.py b/lib/hidapi/hidconsole.py
index 46aaaf9f..86ea255e 100644
--- a/lib/hidapi/hidconsole.py
+++ b/lib/hidapi/hidconsole.py
@@ -50,7 +50,7 @@ if __name__ == '__main__':
 							help='linux device to connect to')
 	args = arg_parser.parse_args()
 
-	from . import hidapi
+	import hidapi
 	print (".. Opening device %s" % args.device)
 	handle = hidapi.open_path(args.device.encode('utf-8'))
 	if handle:
diff --git a/resources/README b/share/README
similarity index 100%
rename from resources/README
rename to share/README
diff --git a/resources/icons/hicolor/128x128/apps/Solaar-fail.png b/share/icons/hicolor/128x128/apps/Solaar-fail.png
similarity index 100%
rename from resources/icons/hicolor/128x128/apps/Solaar-fail.png
rename to share/icons/hicolor/128x128/apps/Solaar-fail.png
diff --git a/resources/icons/hicolor/128x128/apps/Solaar.png b/share/icons/hicolor/128x128/apps/Solaar.png
similarity index 100%
rename from resources/icons/hicolor/128x128/apps/Solaar.png
rename to share/icons/hicolor/128x128/apps/Solaar.png
diff --git a/resources/icons/hicolor/128x128/devices/Unifying Receiver.png b/share/icons/hicolor/128x128/devices/Unifying Receiver.png
similarity index 100%
rename from resources/icons/hicolor/128x128/devices/Unifying Receiver.png
rename to share/icons/hicolor/128x128/devices/Unifying Receiver.png
diff --git a/resources/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png b/share/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png
similarity index 100%
rename from resources/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png
rename to share/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png
diff --git a/resources/icons/hicolor/128x128/status/battery_00.png b/share/icons/hicolor/128x128/status/battery_00.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_00.png
rename to share/icons/hicolor/128x128/status/battery_00.png
diff --git a/resources/icons/hicolor/128x128/status/battery_100.png b/share/icons/hicolor/128x128/status/battery_100.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_100.png
rename to share/icons/hicolor/128x128/status/battery_100.png
diff --git a/resources/icons/hicolor/128x128/status/battery_20.png b/share/icons/hicolor/128x128/status/battery_20.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_20.png
rename to share/icons/hicolor/128x128/status/battery_20.png
diff --git a/resources/icons/hicolor/128x128/status/battery_40.png b/share/icons/hicolor/128x128/status/battery_40.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_40.png
rename to share/icons/hicolor/128x128/status/battery_40.png
diff --git a/resources/icons/hicolor/128x128/status/battery_60.png b/share/icons/hicolor/128x128/status/battery_60.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_60.png
rename to share/icons/hicolor/128x128/status/battery_60.png
diff --git a/resources/icons/hicolor/128x128/status/battery_80.png b/share/icons/hicolor/128x128/status/battery_80.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_80.png
rename to share/icons/hicolor/128x128/status/battery_80.png
diff --git a/resources/icons/hicolor/128x128/status/battery_unknown.png b/share/icons/hicolor/128x128/status/battery_unknown.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/battery_unknown.png
rename to share/icons/hicolor/128x128/status/battery_unknown.png
diff --git a/resources/icons/hicolor/128x128/status/light_00.png b/share/icons/hicolor/128x128/status/light_00.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_00.png
rename to share/icons/hicolor/128x128/status/light_00.png
diff --git a/resources/icons/hicolor/128x128/status/light_100.png b/share/icons/hicolor/128x128/status/light_100.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_100.png
rename to share/icons/hicolor/128x128/status/light_100.png
diff --git a/resources/icons/hicolor/128x128/status/light_20.png b/share/icons/hicolor/128x128/status/light_20.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_20.png
rename to share/icons/hicolor/128x128/status/light_20.png
diff --git a/resources/icons/hicolor/128x128/status/light_40.png b/share/icons/hicolor/128x128/status/light_40.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_40.png
rename to share/icons/hicolor/128x128/status/light_40.png
diff --git a/resources/icons/hicolor/128x128/status/light_60.png b/share/icons/hicolor/128x128/status/light_60.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_60.png
rename to share/icons/hicolor/128x128/status/light_60.png
diff --git a/resources/icons/hicolor/128x128/status/light_80.png b/share/icons/hicolor/128x128/status/light_80.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_80.png
rename to share/icons/hicolor/128x128/status/light_80.png
diff --git a/resources/icons/hicolor/128x128/status/light_unknown.png b/share/icons/hicolor/128x128/status/light_unknown.png
similarity index 100%
rename from resources/icons/hicolor/128x128/status/light_unknown.png
rename to share/icons/hicolor/128x128/status/light_unknown.png
diff --git a/solaar b/solaar
deleted file mode 100755
index d7af0b9c..00000000
--- a/solaar
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-cd -P `dirname "$0"` >/dev/null 2>&1
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib/native/`uname -m`
-export PYTHONPATH=$PWD/app:$PWD/lib
-export XDG_DATA_DIRS=$PWD/resources:$XDG_DATA_DIRS
-
-cd - >/dev/null 2>&1
-
-exec python -OO -m solaar "$@"
-#exec python -OO -m profile -o $TMPDIR/profile.log app/solaar.py "$@"
diff --git a/tools/hidconsole b/tools/hidconsole
deleted file mode 100755
index 0100c11b..00000000
--- a/tools/hidconsole
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd -P `dirname "$0"`/.. >/dev/null 2>&1
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib/native/`uname -m`
-export PYTHONPATH=$PWD/lib
-
-cd - >/dev/null 2>&1
-
-exec python -OO -u -m hidapi.hidconsole "$@"
diff --git a/tools/ur_scanner b/tools/ur_scanner
deleted file mode 100755
index fad07a21..00000000
--- a/tools/ur_scanner
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd -P `dirname "$0"`/.. >/dev/null 2>&1
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib/native/`uname -m`
-export PYTHONPATH=$PWD/lib
-
-cd - >/dev/null 2>&1
-
-exec python -OO -m logitech.ur_scanner "$@"