[pitivi] bin: remove pitivi-flatpak symlink and rename pitivi-bundle

[Thibault Saunier <tsaunier src gnome org>]

commit 4b7621bc36b6d2ee8d9d8c8bfa58fca9c8c475ef
Author: Thibault Saunier <tsaunier gnome org>
Date:   Mon May 23 10:57:48 2016 -0400

    bin: remove pitivi-flatpak symlink and rename pitivi-bundle
    
    to `pitivi-flatpak`.
    
    The symlink was not needed and was bringing some confusion

 bin/pitivi-env                                  |   16 ++++++++--------
 bin/pitivi-flatpak                              |    1 -
 bin/pitivi.installer.desktop                    |    2 +-
 build/flatpak/{pitivi-bundle => pitivi-flatpak} |    0
 4 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/bin/pitivi-env b/bin/pitivi-env
index 49d561d..06ce688 100755
--- a/bin/pitivi-env
+++ b/bin/pitivi-env
@@ -12,11 +12,11 @@ export XDGAPP_ENVPATH=$(realpath $SCRIPTDIR/../../)
 export CURRENT_GST=$XDGAPP_ENVPATH
 export MYPITIVI=$XDGAPP_ENVPATH
 
-export make="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b make"
-export check="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b make check"
-export minstall="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b make install"
-export autogen="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b ./autogen.sh --prefix=/app --disable-gtk-doc"
-export configure="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b ./configure --prefix=/app --disable-gtk-doc"
+export make="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make"
+export check="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make check"
+export minstall="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make install"
+export autogen="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./autogen.sh --prefix=/app 
--disable-gtk-doc"
+export configure="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./configure --prefix=/app 
--disable-gtk-doc"
 
 alias make=$make
 alias check=$check
@@ -24,7 +24,7 @@ alias minstall=$minstall
 alias autogen=$autogen
 alias configure=$configure
 
-alias ptvenv="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b"
+alias ptvenv="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b"
 
 echo "-> Setting up environment if needed..."
 ptvenv "echo"
@@ -32,10 +32,10 @@ if [ "$?" = "0" ];
 then
     for i in `ptvenv ls /app/bin/`;
     do
-        alias $i="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b $i"
+        alias $i="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b $i"
     done
 
-    alias pitivi="$XDGAPP_ENVPATH/pitivi/bin/pitivi-flatpak -b bin/pitivi"
+    alias pitivi="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b bin/pitivi"
 
     export PS1="(ptv-xdgapp) $PS1"
     export PATH="$XDGAPP_ENVPATH/bin/:$PATH"
diff --git a/bin/pitivi.installer.desktop b/bin/pitivi.installer.desktop
index b48b711..0354ddb 100755
--- a/bin/pitivi.installer.desktop
+++ b/bin/pitivi.installer.desktop
@@ -4,4 +4,4 @@ Type=Application
 Terminal=true
 Name=Pitivi flatpak installer and updater
 Icon=pitivi
-Exec=bash -c "cd `dirname %k`; echo 'Getting installation script from 
https://git.gnome.org/browse/pitivi/plain/build/flatpak/pitivi-bundle'; wget 
https://git.gnome.org/browse/pitivi/plain/build/flatpak/pitivi-bundle -O pitivi-flatpak > /dev/null 2>&1; 
chmod +x pitivi-flatpak; ./pitivi-flatpak --installer"
+Exec=bash -c "cd `dirname %k`; echo 'Getting installation script from 
https://git.gnome.org/browse/pitivi/plain/build/flatpak/pitivi-bundle'; wget 
https://git.gnome.org/browse/pitivi/plain/build/flatpak/pitivi-flatpak > /dev/null 2>&1; chmod +x 
pitivi-flatpak; ./pitivi-flatpak --installer"
diff --git a/build/flatpak/pitivi-bundle b/build/flatpak/pitivi-flatpak
similarity index 100%
rename from build/flatpak/pitivi-bundle
rename to build/flatpak/pitivi-flatpak