[pitivi] bin: Make sure to install local before updating
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] bin: Make sure to install local before updating
- Date: Thu, 21 Jan 2016 21:24:44 +0000 (UTC)
commit 1ba4a406f875d1570ab7ca33dcfca38918a5db5c
Author: Thibault Saunier <tsaunier gnome org>
Date: Thu Jan 21 22:20:04 2016 +0100
bin: Make sure to install local before updating
bin/pitivi-git-environment.sh | 2 --
build/xdg-app/pitivi-bundle | 11 +++++------
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 1161249..13835a8 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -380,8 +380,6 @@ if [ "$ready_to_run" != "1" ]; then
export PYTHON=${PITIVI_PYTHON}
done
-
-
# Build all the necessary gstreamer modules.
for m in $MODULES; do
cd $PITIVI
diff --git a/build/xdg-app/pitivi-bundle b/build/xdg-app/pitivi-bundle
index 4d26956..4dbb1b1 100755
--- a/build/xdg-app/pitivi-bundle
+++ b/build/xdg-app/pitivi-bundle
@@ -156,7 +156,7 @@ SDK_INSTALLED=`xdg-app list-runtimes -d |grep "$SDK_NAME/.*/$SDK_VERSION"`
SDK_LOCAL_INSTALLED=`xdg-app list-runtimes -d |grep "$SDK_NAME.Locale.$LOCAL/.*/$SDK_VERSION"`
RUNTIME_INSTALLED=`xdg-app list-runtimes -d |grep "$RUNTIME_NAME/.*/$SDK_VERSION"`
-RUNTIME_LOCAL_INSTALLED=`xdg-app list-runtimes -d |grep "$RUNTIME_NAME.Local.$LOCAL/.*/$SDK_VERSION"`
+RUNTIME_LOCAL_INSTALLED=`xdg-app list-runtimes -d |grep "$RUNTIME_NAME.Locale.$LOCAL/.*/$SDK_VERSION"`
APP_INSTALLED=`xdg-app list-apps -d |grep "$APPLICATION_REF_NAME/.*/$BRANCH"`
if [ -n "$BUNDLE" ]
@@ -211,12 +211,11 @@ then
xdg-app add-remote --no-gpg-verify --user $SDK_REPO_NAME $SDK_REPO > /dev/null 2>&1
xdg-app install-runtime --user $SDK_REPO_NAME $RUNTIME_NAME $SDK_VERSION || exit 1
-
- if [ -n "$LOCAL" ] && [ -z "$RUNTIME_LOCAL_INSTALLED" ]
- then
- echo "-> Installing $RUNTIME_NAME.Locale.$LOCAL"
+fi
+if [ -n "$LOCAL" ] && [ -z "$RUNTIME_LOCAL_INSTALLED" ]
+then
+echo "-> Installing $RUNTIME_NAME.Locale.$LOCAL"
xdg-app install-runtime --user $SDK_REPO_NAME $RUNTIME_NAME.Locale.$LOCAL $SDK_VERSION || exit 1
- fi
fi
# Update runtimes if needed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]