[pitivi] bin: Allow custom source-tree dirname



commit f574df59ff9b61e727300b02654a51d49c570b77
Author: dg1727 <dg1727 hushmail com>
Date:   Thu Jan 19 12:57:27 2017 -0500

    bin: Allow custom source-tree dirname

 bin/pitivi-env |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/bin/pitivi-env b/bin/pitivi-env
index 859c8e2..32fdbcb 100755
--- a/bin/pitivi-env
+++ b/bin/pitivi-env
@@ -11,15 +11,16 @@ SCRIPT=${BASH_SOURCE[0]:-$0}
     && echo \
     && exit 1
 
-SCRIPTDIR=$(dirname $(realpath $SCRIPT))
-export FLATPAK_ENVPATH=$(realpath $SCRIPTDIR/../../)
+SCRIPT_DIR=$(dirname $(realpath $SCRIPT))
+PITIVI_REPO_DIR=$(realpath $SCRIPT_DIR/..)
+export FLATPAK_ENVPATH=$(realpath $PITIVI_REPO_DIR/..)
 export CURRENT_GST=$FLATPAK_ENVPATH
 
 # Use ptvenv for running commands in the sandbox.
-alias ptvenv="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -d"
+alias ptvenv="$PITIVI_REPO_DIR/build/flatpak/pitivi-flatpak -d"
 
 echo "-> Setting up environment if needed..."
-$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d echo
+$PITIVI_REPO_DIR/build/flatpak/pitivi-flatpak -q -d echo
 if [ "$?" = "0" ];
 then
     # Set up environment variables and aliases so configuring, building, etc.
@@ -35,15 +36,15 @@ then
     alias minstall=$minstall
     alias autogen=$autogen
     alias configure=$configure
-    alias ninja="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ninja"
+    alias ninja="$PITIVI_REPO_DIR/build/flatpak/pitivi-flatpak -q -d ninja"
 
     # Prefer to run the binaries in the sandbox. For example "python3".
-    for i in `$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ls /app/bin/`;
+    for i in `$PITIVI_REPO_DIR/build/flatpak/pitivi-flatpak -q -d ls /app/bin/`;
     do
         alias $i="ptvenv $i"
     done
 
-    alias pitivi="ptvenv $FLATPAK_ENVPATH/pitivi/bin/pitivi"
+    alias pitivi="ptvenv $PITIVI_REPO_DIR/bin/pitivi"
 
     export PS1="(ptv-flatpak) $PS1"
     export PATH="$FLATPAK_ENVPATH/bin/:$PATH"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]