[pitivi] build: Do not cd pitivi/ before running commands in the sandbox
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] build: Do not cd pitivi/ before running commands in the sandbox
- Date: Mon, 21 Mar 2016 13:18:27 +0000 (UTC)
commit 9f070492857d90ebf86ff811fa9635cc29335119
Author: Thibault Saunier <tsaunier gnome org>
Date: Mon Mar 21 14:18:01 2016 +0100
build: Do not cd pitivi/ before running commands in the sandbox
build/xdg-app/enter_env | 5 ++---
build/xdg-app/pitivi-bundle | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/build/xdg-app/enter_env b/build/xdg-app/enter_env
index fb6b69a..c364de3 100755
--- a/build/xdg-app/enter_env
+++ b/build/xdg-app/enter_env
@@ -1,8 +1,5 @@
#!/bin/sh
-GITREPO="$(git rev-parse --show-toplevel)"
-cd $GITREPO
-
function generate_path_and_completion_calls {
echo "export PATH=$GITREPO/bin/:\$PATH"
echo "export CC='ccache gcc'"
@@ -21,6 +18,8 @@ then
echo "Entering own built environment"
echo "=============================="
+ GITREPO="$(git rev-parse --show-toplevel)"
+ cd $GITREPO
bash --rcfile $RCFILE
else
$*
diff --git a/build/xdg-app/pitivi-bundle b/build/xdg-app/pitivi-bundle
index de36c7d..13cefe2 100755
--- a/build/xdg-app/pitivi-bundle
+++ b/build/xdg-app/pitivi-bundle
@@ -359,7 +359,6 @@ then
# Launch development environment if we are not creating a bundle
if [ -z $BUNDLE ]
then
- cd $SCRIPTDIR
xdg-app build --socket=x11 --socket=session-bus --socket=pulseaudio \
--share=network \
--env=GST_DEBUG=$GST_DEBUG \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]