1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-23 01:17:24 +08:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Marc Cornellà
3d51d63077 fix(changelog): fix spacing in breaking changes message 2021-01-10 20:43:32 +01:00
Marc Cornellà
3635d7cf7e fix(universalarchive): make plugin zsh-only to fix realpath not found error
Fixes #9586
2021-01-10 18:34:18 +01:00
2 changed files with 9 additions and 9 deletions

View File

@ -10,28 +10,28 @@ Supported archive formats are:
tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst." tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
if [[ $# -lt 2 ]]; then if [[ $# -lt 2 ]]; then
echo >&2 "$usage" print -u2 -- "$usage"
return 1 return 1
fi fi
local ext="$1" local ext="$1"
local input="$(realpath "$2")" local input="${2:a}"
shift shift
if [[ ! -e "$input" ]]; then if [[ ! -e "$input" ]]; then
echo >&2 "$input not found" print -u2 -- "$input not found"
return 1 return 1
fi fi
# generate output file name # generate output file name
local output local output
if [[ $# -gt 1 ]]; then if [[ $# -gt 1 ]]; then
output="$(basename "${input%/*}")" output="${input:h:t}"
elif [[ -f "$input" ]]; then elif [[ -f "$input" ]]; then
output="$(basename "${input%.[^.]*}")" output="${input:r:t}"
elif [[ -d "$input" ]]; then elif [[ -d "$input" ]]; then
output="$(basename "${input}")" output="${input:t}"
fi fi
# if output file exists, generate a random name # if output file exists, generate a random name
@ -44,7 +44,7 @@ tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
# safety check # safety check
if [[ -f "$output" ]]; then if [[ -f "$output" ]]; then
echo >&2 "output file '$output' already exists. Aborting" print -u2 -- "output file '$output' already exists. Aborting"
return 1 return 1
fi fi
@ -65,6 +65,6 @@ tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
Z) compress -vcf "${@}" > "${output}" ;; Z) compress -vcf "${@}" > "${output}" ;;
zip) zip -rull "${output}" "${@}" ;; zip) zip -rull "${output}" "${@}" ;;
zst) zstd -c -T0 "${@}" > "${output}" ;; zst) zstd -c -T0 "${@}" > "${output}" ;;
*) echo >&2 "$usage"; return 1 ;; *) print -u2 -- "$usage"; return 1 ;;
esac esac
} }

View File

@ -286,7 +286,7 @@ function display-release {
local hash subject local hash subject
for hash message in ${(kv)breaking}; do for hash message in ${(kv)breaking}; do
echo " - $(fmt:hash) $(fmt:scope) $(fmt:subject "${message}")" echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject "${message}")"
done | sort done | sort
echo echo
} }