[pitivi] flatpak: Small changes for consistency
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] flatpak: Small changes for consistency
- Date: Sat, 16 Jul 2016 09:15:53 +0000 (UTC)
commit e3797516a17a9bcd4fd2914c8f64a8f4973ed855
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Thu Jul 7 13:34:54 2016 +0200
flatpak: Small changes for consistency
build/flatpak/pitivi-flatpak | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index a9107ae..61d3a69 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -44,7 +44,7 @@ GST_VERSION=master
# ------------------------------------------- #
-flatpak remote-add --help |grep "\-\-from" > /dev/null 2>&1
+flatpak remote-add --help | grep "\-\-from" > /dev/null 2>&1
if [ ! $? -eq 0 ]
then
printf "$RED \nYou need to install flatpak >= 0.6.4 to be able to use the '$0' script.
@@ -64,8 +64,8 @@ fi
# ------------------------------------------- #
# Computation of actual variable values
-APPLICATION_REPO_NAME=`flatpak remote-list --user -d | grep "$APPLICATION_FLATPAK_REPO" |awk '{ print $1 }'`
-flatpak remote-list --user |grep $APPLICATION_DEFAULT_REPO_NAME > /dev/null 2>&1
+APPLICATION_REPO_NAME=`flatpak remote-list --user -d | grep "$APPLICATION_FLATPAK_REPO" | awk '{ print $1 }'`
+flatpak remote-list --user | grep $APPLICATION_DEFAULT_REPO_NAME > /dev/null 2>&1
res=$?
# Update remote URL if needed
if [ $res != 0 ] && [ -n "$APPLICATION_REPO_NAME" ]
@@ -77,7 +77,7 @@ fi
APPLICATION_REPO_NAME=${APPLICATION_REPO_NAME:-$APPLICATION_DEFAULT_REPO_NAME}
SCRIPTDIR="$( cd "$( dirname "$(readlink -f ${BASH_SOURCE[0]})" )" && pwd )"
-SDK_REPO_NAME=`flatpak remote-list --user -d | grep "$SDK_REPO" |awk '{ print $1 }'`
+SDK_REPO_NAME=`flatpak remote-list --user -d | grep "$SDK_REPO" | awk '{ print $1 }'`
SDK_REPO_NAME=${SDK_REPO_NAME:-$SDK_DEFAULT_REPO_NAME}
REPO=$FLATPAK_ENVPATH/flatpak-repos/$APPLICATION_NAME
@@ -196,12 +196,12 @@ then
exit 0
fi
-SDK_INSTALLED=`flatpak list --runtime -d |grep "$SDK_NAME/.*/$SDK_VERSION"`
-SDK_LOCAL_INSTALLED=`flatpak list --runtime -d |grep "$SDK_NAME.Locale/.*/$SDK_VERSION"`
+SDK_INSTALLED=`flatpak list --runtime -d | grep "$SDK_NAME/.*/$SDK_VERSION"`
+SDK_LOCAL_INSTALLED=`flatpak list --runtime -d | grep "$SDK_NAME.Locale/.*/$SDK_VERSION"`
-RUNTIME_INSTALLED=`flatpak list --runtime -d |grep "$RUNTIME_NAME/.*/$SDK_VERSION"`
-RUNTIME_LOCAL_INSTALLED=`flatpak list --runtime -d |grep "$RUNTIME_NAME.Locale/.*/$SDK_VERSION"`
-APP_INSTALLED=`flatpak list -d |grep "$APPLICATION_REF_NAME/.*/$BRANCH"`
+RUNTIME_INSTALLED=`flatpak list --runtime -d | grep "$RUNTIME_NAME/.*/$SDK_VERSION"`
+RUNTIME_LOCAL_INSTALLED=`flatpak list --runtime -d | grep "$RUNTIME_NAME.Locale/.*/$SDK_VERSION"`
+APP_INSTALLED=`flatpak list -d | grep "$APPLICATION_REF_NAME/.*/$BRANCH"`
if [ -n "$BUNDLE" ]
then
@@ -264,7 +264,7 @@ function build_local_repo {
echo "-> Building $APPLICATION_NAME from current repository"
cd $APPLICATION_REPOSITORY
run_in_sandbox "./configure --prefix=/app --libdir=lib" || exit 1
- run_in_sandbox make ||exit 1
+ run_in_sandbox make || exit 1
}
# Install needed runtimes
@@ -307,7 +307,6 @@ fi
if [ -n "$UPDATE" ]
then
echo "-> Updating $RUNTIME_NAME $SDK_VERSION"
-
flatpak update --user $RUNTIME_NAME $SDK_VERSION || exit 1
echo "-> Updating $RUNTIME_NAME.Locale"
@@ -327,7 +326,7 @@ fi
if [ -n "$BUILD" ] && [ -z "$BUNDLE" ]
then
cd $APPLICATION_REPOSITORY
- DEVELOPMENT_BRANCHNAME=`git branch 2>&1 |grep \* |awk '{ print $2 }'`
+ DEVELOPMENT_BRANCHNAME=`git branch 2>&1 | grep \* | awk '{ print $2 }'`
cd - > /dev/null
if [ x$DEVELOPMENT_BRANCHNAME == 'x' ]
then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]