diff options
| author | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2016-01-13 16:32:09 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2016-01-13 16:03:48 +0000 |
| commit | 4d56d73412a155b74c4f860df81d86977f9337eb (patch) | |
| tree | 552f71bf850598917d5fb73f9d693885840ff4e9 /qt-ostree | |
| parent | 6e2cf5b045ad4a0ee4e9ae03ef719e053da121db (diff) | |
Do not require path to exist in readlink
If path does not exist, readlink returns non-zero exit code
and qt-ostree script exits - see 'set -e'.
canonicalize by following every symlink in every component of the
given name recursively, without requirements on components existence.
Change-Id: I248a9074fd43a84f6a4980c45b06dd6b55d637f8
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'qt-ostree')
| -rwxr-xr-x | qt-ostree/qt-ostree | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qt-ostree/qt-ostree b/qt-ostree/qt-ostree index cfbcb83..ea3479e 100755 --- a/qt-ostree/qt-ostree +++ b/qt-ostree/qt-ostree @@ -216,24 +216,24 @@ parse_args() VERBOSE=v ;; --ostree-repo) - OSTREE_REPO=$(readlink -f ${2}) + OSTREE_REPO=$(readlink -m ${2}) shift 1 ;; --uboot-env-file) - UBOOT_ENV_FILE=$(readlink -f ${2}) + UBOOT_ENV_FILE=$(readlink -m ${2}) shift 1 ;; --tls-ca-path) - SERVER_CERT=$(readlink -f ${2}) + SERVER_CERT=$(readlink -m ${2}) shift 1 ;; --tls-client-cert-path) - CLIENT_CERT=$(readlink -f ${2}) + CLIENT_CERT=$(readlink -m ${2}) USE_CLIENT_TLS=true shift 1 ;; --tls-client-key-path) - CLIENT_KEY=$(readlink -f ${2}) + CLIENT_KEY=$(readlink -m ${2}) USE_CLIENT_TLS=true shift 1 ;; @@ -246,11 +246,11 @@ parse_args() shift 1 ;; --sysroot-image-path) - SYSROOT_IMAGE_PATH=$(readlink -f ${2}) + SYSROOT_IMAGE_PATH=$(readlink -m ${2}) shift 1 ;; --initramfs) - INITRAMFS=$(readlink -f ${2}) + INITRAMFS=$(readlink -m ${2}) shift 1 ;; --gpg-sign) @@ -259,12 +259,12 @@ parse_args() shift 1 ;; --gpg-homedir) - GPG_HOMEDIR=$(readlink -f ${2}) + GPG_HOMEDIR=$(readlink -m ${2}) USE_GPG=true shift 1 ;; --gpg-trusted-keyring) - GPG_TRUSTED_KEYRING=$(readlink -f ${2}) + GPG_TRUSTED_KEYRING=$(readlink -m ${2}) shift 1 ;; -h | -help | --help) |