Skip to content

Commit 10a6d15

Browse files
authored
Merge pull request #648 from ocaisa/realpath_replacement
Use `readlink -f` instead of `realpath` (CentOS6)
2 parents 9431767 + bd328a2 commit 10a6d15

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

init/eessi_archdetect.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ cpupath(){
8989
*) log "ERROR" "cpupath: Unsupported CPU architecture $machine_type"
9090
esac
9191
# spec files are located in a subfolder with this script
92-
local base_dir=$(dirname $(realpath $0))
92+
local base_dir=$(dirname $(readlink -f $0))
9393
update_arch_specs "$base_dir/arch_specs/${spec_file}"
9494

9595
# Identify the host CPU vendor

init/eessi_environment_variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# this script is *sourced*, not executed, so can't rely on $0 to determine path to self
22
# $BASH_SOURCE points to correct path, see also http://mywiki.wooledge.org/BashFAQ/028
3-
EESSI_INIT_DIR_PATH=$(dirname $(realpath $BASH_SOURCE))
3+
EESSI_INIT_DIR_PATH=$(dirname $(readlink -f $BASH_SOURCE))
44

55
function error() {
66
echo -e "\e[31mERROR: $1\e[0m" >&2

init/minimal_eessi_env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# this script is *sourced*, not executed, so can't rely on $0 to determine path to self
44
# $BASH_SOURCE points to correct path, see also http://mywiki.wooledge.org/BashFAQ/028
5-
EESSI_INIT_DIR_PATH=$(dirname $(realpath $BASH_SOURCE))
5+
EESSI_INIT_DIR_PATH=$(dirname $(readlink -f $BASH_SOURCE))
66

77
# set up defaults: EESSI_CVMFS_REPO, EESSI_VERSION
88
# script takes *_OVERRIDEs into account

0 commit comments

Comments
 (0)