Alias readlink command

See the previous commit on `getopt`

Signed-off-by: Cristian Le <[email protected]>

src/beakerlib.sh

@@ -34,6 +34,7 @@
 
 # Command aliases for compatibilities. Set them by replacing this string through the Makefile interface
 declare -r __INTERNAL_GETOPT_CMD="getopt"
+declare -r __INTERNAL_READLINK_CMD="readlink"
 
 __INTERNAL_SOURCED=${__INTERNAL_SOURCED-}
 echo "${__INTERNAL_SOURCED}" | grep -qF -- " ${BASH_SOURCE} " && return || __INTERNAL_SOURCED+=" ${BASH_SOURCE} "
@@ -479,7 +480,7 @@ TESTID=${TESTID-}
 JOBID=${JOBID-}
 RECIPEID=${RECIPEID-}
 BEAKERLIB_JOURNAL=${BEAKERLIB_JOURNAL-}
-export BEAKERLIB=${BEAKERLIB:-$(dirname "$(readlink -e ${BASH_SOURCE})")}
+export BEAKERLIB=${BEAKERLIB:-$(dirname "$($__INTERNAL_READLINK_CMD -e ${BASH_SOURCE})")}
 . $BEAKERLIB/storage.sh
 . $BEAKERLIB/infrastructure.sh
 . $BEAKERLIB/journal.sh

src/infrastructure.sh

@@ -713,7 +713,7 @@ rlFileBackup() {
  file="$(echo "$file" | sed "s|^\([^/]\)|$PWD/\1|" | sed 's|/$||')"
  # follow symlinks in parent dir
  path="$(dirname "$file")"
- path="$(readlink -n -m "$path")"
+ path="$($__INTERNAL_READLINK_CMD -n -m "$path")"
  file="$path/$(basename "$file")"
 
  # bail out if the file does not exist

src/libraries.sh

@@ -114,15 +114,15 @@ __INTERNAL_extractOrigin(){
 
  if [ ! -e "$0" ]
  then
- SOURCE="$( readlink -f . )"
+ SOURCE="$( $__INTERNAL_READLINK_CMD -f . )"
  else
- SOURCE="$( readlink -f $0 )"
+ SOURCE="$( $__INTERNAL_READLINK_CMD -f $0 )"
  fi
 
  local DIR="$( dirname "$SOURCE" )"
  while [ -h "$SOURCE" ]
  do
- SOURCE="$(readlink -f "$SOURCE")"
+ SOURCE="$($__INTERNAL_READLINK_CMD -f "$SOURCE")"
  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
  done

src/logging.sh

@@ -551,7 +551,7 @@ rlFileSubmit() {
  ALIAS=$(echo $ALIAS | tr '/' "$SEPARATOR" | sed "s/^${SEPARATOR}*//")
  fi
  rlLogInfo "Sending $FILE as $ALIAS"
- ln -s "$(readlink -f $FILE)" "$TMPDIR/$ALIAS"
+ ln -s "$($__INTERNAL_READLINK_CMD -f $FILE)" "$TMPDIR/$ALIAS"
 
  if [ -z "$BEAKERLIB_COMMAND_SUBMIT_LOG" ]
  then

src/rpms.sh

@@ -340,7 +340,7 @@ rlAssertBinaryOrigin() {
  {
  status=1
  # expand symlinks (if any)
- local BINARY=$(readlink -f $FULL_CMD)
+ local BINARY=$($__INTERNAL_READLINK_CMD -f $FULL_CMD)
 
  # get the rpm owning the binary
  local BINARY_RPM=$(rpm -qf --qf="%{name}\n" $BINARY | uniq)