From 4af760f9915749b6c13823b881543f7486a72de9 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Thu, 19 Jan 2017 09:15:19 +0100
Subject: [PATCH] PKG: install setup scripts (mantis-1336
---
.../Packaging/Files/{otbenv.profile => otbenv.bash} | 10 +++-------
SuperBuild/Packaging/Files/otbenv.cmd | 2 +-
SuperBuild/Packaging/InstallSupportFiles.cmake | 6 +++---
3 files changed, 7 insertions(+), 11 deletions(-)
rename SuperBuild/Packaging/Files/{otbenv.profile => otbenv.bash} (52%)
diff --git a/SuperBuild/Packaging/Files/otbenv.profile b/SuperBuild/Packaging/Files/otbenv.bash
similarity index 52%
rename from SuperBuild/Packaging/Files/otbenv.profile
rename to SuperBuild/Packaging/Files/otbenv.bash
index ac6e35ff54..4cc55aeb40 100644
--- a/SuperBuild/Packaging/Files/otbenv.profile
+++ b/SuperBuild/Packaging/Files/otbenv.bash
@@ -1,17 +1,13 @@
-#!/bin/sh
+#!/usr/bin/env bash
-DIRNAME_0=$(dirname "$0")
-cd "$DIRNAME_0"
-
-CURRENT_DIR=$(pwd)
+CURRENT_DIR=$(cd -P -- "$(dirname -- "$BASH_SOURCE")" && printf '%s\n' "$(pwd -P)")
unset LD_LIBRARY_PATH
-PATH=$PATH:$CURRENT_DIR/bin
+PATH=$CURRENT_DIR/bin:$PATH
GDAL_DATA=$CURRENT_DIR/share/gdal
GEOTIFF_CSV=$CURRENT_DIR/share/epsg_csv
export PATH
export GDAL_DATA
export GEOTIFF_CSV
-
diff --git a/SuperBuild/Packaging/Files/otbenv.cmd b/SuperBuild/Packaging/Files/otbenv.cmd
index 493cfbde97..e7f605870e 100644
--- a/SuperBuild/Packaging/Files/otbenv.cmd
+++ b/SuperBuild/Packaging/Files/otbenv.cmd
@@ -1,6 +1,6 @@
set CURRENT_SCRIPT_DIR=%~dp0
-set PATH=%PATH%;%CURRENT_SCRIPT_DIR%\bin
+set PATH=%CURRENT_SCRIPT_DIR%\bin;%PATH%
set GDAL_DATA=%CURRENT_SCRIPT_DIR%\share\gdal
diff --git a/SuperBuild/Packaging/InstallSupportFiles.cmake b/SuperBuild/Packaging/InstallSupportFiles.cmake
index 7edf0e3851..860c46da10 100644
--- a/SuperBuild/Packaging/InstallSupportFiles.cmake
+++ b/SuperBuild/Packaging/InstallSupportFiles.cmake
@@ -235,10 +235,9 @@ function(func_install_otb_support_files)
)
install(
- FILES ${PACKAGE_SUPPORT_FILES_DIR}/otbenv.profile
+ FILES ${PACKAGE_SUPPORT_FILES_DIR}/otbenv.bash
DESTINATION ${PKG_STAGE_DIR}
- RENAME otbenv.sh
- )
+ )
#we need startup files for mapla monteverdi in the root directory
#For Unixes, we make them inside pkgsetup script!
@@ -293,6 +292,7 @@ function(func_install_monteverdi_support_files)
# we find this value by parsing ConfigureMonteverdi.h
set(ConfigureMonteverdi_H "${OTB_BINARY_DIR}/Modules/Visualization/MonteverdiCore/ConfigureMonteverdi.h")
if(NOT EXISTS "${ConfigureMonteverdi_H}")
+ #maybe deactivate monteverdi?
message(FATAL_ERROR "${ConfigureMonteverdi_H} does not exists. Cannot continue")
endif()
--
GitLab