summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2012-07-03 16:37:22 +0200
committerJonathan Bauer2012-07-03 16:37:22 +0200
commit35d21b3a64daf823826c69621ae0e1527be0123d (patch)
treebd3c4dc443b28e32ca4ee67e6a375b6f862410c5
parentworkaround to load ssl sites (todo proper error handling) (diff)
downloadfbgui-35d21b3a64daf823826c69621ae0e1527be0123d.tar.gz
fbgui-35d21b3a64daf823826c69621ae0e1527be0123d.tar.xz
fbgui-35d21b3a64daf823826c69621ae0e1527be0123d.zip
minor
-rw-r--r--src/fbgui/fbgui.cpp2
-rwxr-xr-xtestApp.sh5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp
index 0fd61be..b4a92ca 100644
--- a/src/fbgui/fbgui.cpp
+++ b/src/fbgui/fbgui.cpp
@@ -286,7 +286,7 @@ QByteArray fbgui::generatePOSTData() {
// everything ok, read data
serial = file.readAll();
file.close();
- //serial.chop(1); // chop EOF
+ serial.chop(1);
LOG4CXX_DEBUG(coreLogger, "[post] Serial number is: " << serial);
if (gInterfaceName.isEmpty())
diff --git a/testApp.sh b/testApp.sh
index b35c18e..56e467a 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -32,11 +32,6 @@ done
[ -f /tmp/fbgui.log ] && rm /tmp/fbgui.log
[ -f /tmp/fbgui_trigger ] && rm /tmp/fbgui_trigger
-# path to script (including script name)
-script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")"
-
-# to get the path only: use dirname which strips the filename from a path
-working_path=`dirname "$script_path"`
# construct unique display_id based on user, needed for multi-user qvfb usage
display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}')