Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
212
Issues
212
List
Boards
Labels
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
8d2539f1
Commit
8d2539f1
authored
Oct 03, 2017
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: apply shellcheck to fix potential script issues
parent
e6a8d0f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Packaging/Files/linux_pkgsetup.in
Packaging/Files/linux_pkgsetup.in
+2
-2
Packaging/Files/macx_pkgsetup.in
Packaging/Files/macx_pkgsetup.in
+1
-1
Utilities/Maintenance/SuperbuildDownloadList.sh
Utilities/Maintenance/SuperbuildDownloadList.sh
+1
-1
No files found.
Packaging/Files/linux_pkgsetup.in
View file @
8d2539f1
...
...
@@ -44,7 +44,7 @@ PATCH_ELF_EXE="$OUT_DIR/patchelf"
#do not move below block. it must be before "unset LD_LIBRARY_PATH" code
#check if we have any python bindings
if
[
-f
"
$OUT_DIR
/lib/python/_otbApplication.so"
]
;
then
chmod
+x
$OUT_DIR
/setup_python.sh
chmod
+x
"
$OUT_DIR
/setup_python.sh"
./setup_python.sh
||
setup_python_ret
=
$?
fi
...
...
@@ -52,7 +52,7 @@ fi
unset
LD_LIBRARY_PATH
# we remove files in $OUT_DIR/lib/gtk which we CANNOT add new rpath
BINARY_FILES
=
$(
find
$OUT_DIR
/lib
$OUT_DIR
/bin
-type
f
-exec
file
{}
\;
|
grep
-v
'/lib/gtk/'
|
grep
-i
elf|cut
-f1
-d
':'
)
BINARY_FILES
=
$(
find
"
$OUT_DIR
/lib"
"
$OUT_DIR
/bin"
-type
f
-exec
file
{}
\;
|
grep
-v
'/lib/gtk/'
|
grep
-i
elf|cut
-f1
-d
':'
)
# run patchelf
for
bin_file
in
$BINARY_FILES
;
do
#echo "adding rpath to $bin_file"
...
...
Packaging/Files/macx_pkgsetup.in
View file @
8d2539f1
...
...
@@ -41,7 +41,7 @@ OUT_DIR=$(pwd)
#do not move below 3 lines. it must be before "unset LD_LIBRARY_PATH" code
if
[
-f
"
$OUT_DIR
/lib/python/_otbApplication.so"
]
;
then
chmod
+x
$OUT_DIR
/setup_python.sh
chmod
+x
"
$OUT_DIR
/setup_python.sh"
./setup_python.sh
||
setup_python_ret
=
$?
fi
...
...
Utilities/Maintenance/SuperbuildDownloadList.sh
View file @
8d2539f1
...
...
@@ -45,7 +45,7 @@ if [[ "$GIT_BRANCH" =~ release-* ]]; then
else
VERSION
=
"develop"
fi
CMAKE_FILES
=
$(
find
$SB_CMAKE_DIR
-maxdepth
1
-type
f
-name
"External_*"
)
CMAKE_FILES
=
$(
find
"
${
SB_CMAKE_DIR
}
"
-maxdepth
1
-type
f
-name
"External_*"
)
DOWNLOAD_LIST
=
$(
grep
-h
-E
'^[^#]*\"(ftp|http|https)://.*(\.tar\.gz|\.tar\.bz2|\.tgz|\.tar\.xz|\.zip|export=download).*\"'
${
CMAKE_FILES
}
|
grep
-o
-E
'(ftp|http|https)://[^\"]*'
|
sort
|
uniq
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment