Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
ddc9e48c
Commit
ddc9e48c
authored
5 years ago
by
Alexander Schlarb
Browse files
Options
Downloads
Patches
Plain Diff
make-ring: Avoid unquoted shell variables wherever possible (install.sh)
Change-Id: I9d580743ebe40a8c9edc534ba23b5ddbb01e921b
parent
2d6169b0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/install.sh
+20
-20
20 additions, 20 deletions
scripts/install.sh
with
20 additions
and
20 deletions
scripts/install.sh
+
20
−
20
View file @
ddc9e48c
...
...
@@ -15,7 +15,7 @@ set -ex
global
=
false
static
=
''
client
=
''
proc
=
''
proc
=
'
1
'
while
getopts
gsc:p: OPT
;
do
case
"
$OPT
"
in
g
)
...
...
@@ -37,7 +37,7 @@ while getopts gsc:p: OPT; do
done
make_install
()
{
if
$1
;
then
if
[
"
$1
"
=
"true"
]
;
then
sudo
make
install
# Or else the next non-sudo install will fail, because this generates some
# root owned files like install_manifest.txt under the build directory.
...
...
@@ -50,7 +50,7 @@ make_install() {
TOP
=
"
$(
pwd
)
"
INSTALL
=
"
${
TOP
}
/install"
if
$
global
;
then
if
[
"
${
global
}
"
=
"true"
]
;
then
BUILDDIR
=
"build-global"
else
BUILDDIR
=
"build-local"
...
...
@@ -71,38 +71,38 @@ if [[ "$OSTYPE" != "darwin"* ]]; then
sharedLib
=
"--disable-shared"
fi
if
$
global
;
then
if
[
"
${
global
}
"
=
"true"
]
;
then
./configure
$sharedLib
$CONFIGURE_FLAGS
else
./configure
$sharedLib
$CONFIGURE_FLAGS
--prefix
=
"
${
INSTALL
}
/daemon"
fi
make
-j
${
proc
}
make_install
$
global
make
-j
"
${
proc
}
"
make_install
"
${
global
}
"
cd
"
${
TOP
}
/lrc"
mkdir
-p
${
BUILDDIR
}
cd
${
BUILDDIR
}
if
$
global
;
then
cmake ..
-DCMAKE_PREFIX_PATH
=
$
CMAKE_PREFIX_PATH
-DCMAKE_BUILD_TYPE
=
Debug
$static
mkdir
-p
"
${
BUILDDIR
}
"
cd
"
${
BUILDDIR
}
"
if
[
"
${
global
}
"
=
"true"
]
;
then
cmake ..
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
-DCMAKE_BUILD_TYPE
=
Debug
$static
else
cmake ..
-DCMAKE_PREFIX_PATH
=
$
CMAKE_PREFIX_PATH
\
cmake ..
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
\
-DCMAKE_BUILD_TYPE
=
Debug
\
-DCMAKE_INSTALL_PREFIX
=
"
${
INSTALL
}
/lrc"
\
-DRING_BUILD_DIR
=
"
${
DAEMON
}
/src"
$static
fi
make
-j
${
proc
}
make_install
$
global
make
-j
"
${
proc
}
"
make_install
"
${
global
}
"
cd
"
${
TOP
}
/
${
client
}
"
mkdir
-p
${
BUILDDIR
}
cd
${
BUILDDIR
}
if
$
global
;
then
cmake ..
-DCMAKE_PREFIX_PATH
=
$
CMAKE_PREFIX_PATH
$static
mkdir
-p
"
${
BUILDDIR
}
"
cd
"
${
BUILDDIR
}
"
if
[
"
${
global
}
"
=
"true"
]
;
then
cmake ..
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
$static
else
cmake ..
-DCMAKE_PREFIX_PATH
=
$
CMAKE_PREFIX_PATH
\
cmake ..
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
\
-DCMAKE_INSTALL_PREFIX
=
"
${
INSTALL
}
/
${
client
}
"
\
-DRINGTONE_DIR
=
"
${
INSTALL
}
/daemon/share/ring/ringtones"
\
-DLibRingClient_DIR
=
"
${
INSTALL
}
/lrc/lib/cmake/LibRingClient"
$static
fi
make
-j
${
proc
}
make_install
$
global
make
-j
"
${
proc
}
"
make_install
"
${
global
}
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment