[pitivi] Remove hacks related to AppImageKit

[Thibault Saunier <tsaunier src gnome org>]

commit 55297127a348697b3cb56ee679035192ea19892f
Author: Thibault Saunier <tsaunier gnome org>
Date:   Wed Jun 1 15:19:20 2016 -0400

    Remove hacks related to AppImageKit
    
    Reviewed-by: Alex Băluț <alexandru balut gmail com>
    Differential Revision: https://phabricator.freedesktop.org/D1045

 bin/pitivi.in                |   21 ++++++---------------
 build/flatpak/pitivi-flatpak |    7 +++++--
 pitivi/utils/misc.py         |    6 +-----
 3 files changed, 12 insertions(+), 22 deletions(-)
---
diff --git a/bin/pitivi.in b/bin/pitivi.in
index 4be01a9..a46225b 100644
--- a/bin/pitivi.in
+++ b/bin/pitivi.in
@@ -32,21 +32,12 @@ except OSError:
     pass
 
 
-if "APPDIR" in os.environ:
-    basedir = os.environ["APPDIR"]
-    CONFIGURED_PYTHONPATH = ""
-    CONFIGURED_GI_TYPELIB_PATH = ""
-    CONFIGURED_LD_LIBRARY_PATH = ""
-    CONFIGURED_GST_PLUGIN_PATH = ""
-    LIBDIR = os.path.join(basedir, 'usr', 'lib')
-    DATADIR = os.path.join(basedir, "usr", "share")
-else:
-    CONFIGURED_PYTHONPATH = '@CONFIGURED_PYTHONPATH@'
-    CONFIGURED_GI_TYPELIB_PATH = '@CONFIGURED_GI_TYPELIB_PATH@'
-    CONFIGURED_LD_LIBRARY_PATH = '@CONFIGURED_LD_LIBRARY_PATH@'
-    CONFIGURED_GST_PLUGIN_PATH = '@CONFIGURED_GST_PLUGIN_PATH@'
-    LIBDIR = '@LIBDIR@'
-    DATADIR = '@DATADIR@'
+CONFIGURED_PYTHONPATH = '@CONFIGURED_PYTHONPATH@'
+CONFIGURED_GI_TYPELIB_PATH = '@CONFIGURED_GI_TYPELIB_PATH@'
+CONFIGURED_LD_LIBRARY_PATH = '@CONFIGURED_LD_LIBRARY_PATH@'
+CONFIGURED_GST_PLUGIN_PATH = '@CONFIGURED_GST_PLUGIN_PATH@'
+LIBDIR = '@LIBDIR@'
+DATADIR = '@DATADIR@'
 
 
 def _prepend_env_path(name, value):
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 2502f62..45ea22e 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -379,7 +379,7 @@ then
     echo "Building with: $FLATPAK_BUILDER $XDG_APP_BUILD_OPTIONS $PREFIX $JSON"
     $FLATPAK_BUILDER --ccache $XDG_APP_BUILD_OPTIONS $PREFIX $JSON || exit 1
 
-    if [ -z $BUNDLE ] || [ -n $CHECK ]
+    if [ -z $BUNDLE ] || [ -n "$CHECK" ]
     then
       echo "-> Building $APPLICATION_NAME from current repository"
       cd $APPLICATION_REPOSITORY && $FLATPAK build --env=PYTHON=python3 $PREFIX ./autogen.sh --prefix=/app 
|| exit 1
@@ -402,8 +402,11 @@ then
       $PREFIX $SCRIPTDIR/enter-env "$@"
 
     exit $exitcode
-  elif [ -n $CHECK ]
+  fi
+
+  if [ -n "$CHECK" ]
   then
+      echo "Running tests with nosetests"
       $FLATPAK build --socket=x11 --socket=session-bus --socket=pulseaudio \
       --share=network \
       --env=GST_DEBUG=$GST_DEBUG \
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index 87d082e..66ed87c 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -251,11 +251,7 @@ def show_user_manual(page=None):
     Optional: for contextual help, a page ID can be specified.
     """
     time_now = int(time.time())
-    if "APPDIR" in os.environ:
-        uris = (APPMANUALURL_ONLINE,)
-    else:
-        uris = (APPMANUALURL_OFFLINE, APPMANUALURL_ONLINE)
-
+    uris = (APPMANUALURL_OFFLINE, APPMANUALURL_ONLINE)
     for uri in uris:
         if page is not None:
             uri += "#" + page