diff options
| author | Mateusz Galazyn | 2021-08-10 08:45:04 +0200 |
|---|---|---|
| committer | Mateusz Galazyn | 2021-08-10 08:45:04 +0200 |
| commit | 83502769ba6287bf258064292a51d45a034aab67 (patch) | |
| tree | 843130c16884e45f3872736a42b1591e4ff735ab | |
| parent | f3381814df9609a1ea3cf4f27f2026a221063c31 (diff) | |
| download | aur-83502769ba6287bf258064292a51d45a034aab67.tar.gz | |
Fix patch for zimfw.zsh (thanks Rhinoceros)
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | zimfw.zsh.patch | 19 |
3 files changed, 16 insertions, 19 deletions
@@ -1,7 +1,7 @@ pkgbase = zsh-zim-git pkgdesc = ZIM - Zsh IMproved - pkgver = r548.74367b8 - pkgrel = 3 + pkgver = r569.35cd6f5 + pkgrel = 1 url = https://github.com/zimfw/zimfw install = zim.install arch = any @@ -22,8 +22,7 @@ pkgbase = zsh-zim-git md5sums = SKIP md5sums = SKIP md5sums = 6e5ffd11ddfc72d74afb105829821f28 - md5sums = 2465e684f59cbb9313670468493f7712 + md5sums = 65deeb0db560f14c98838f9bfa72d7c3 md5sums = 0cb8764ba7f67c37c3c6452cc06751af pkgname = zsh-zim-git - @@ -1,7 +1,7 @@ # Contributor: Mateusz Galazyn <carbolymer at gmail.com> -pkgrel=3 -pkgver=r548.74367b8 +pkgrel=1 +pkgver=r569.35cd6f5 pkgname=zsh-zim-git pkgdesc="ZIM - Zsh IMproved" url="https://github.com/zimfw/zimfw" @@ -18,7 +18,7 @@ source=('git://github.com/zimfw/zimfw.git' md5sums=('SKIP' 'SKIP' '6e5ffd11ddfc72d74afb105829821f28' - '2465e684f59cbb9313670468493f7712' + '65deeb0db560f14c98838f9bfa72d7c3' '0cb8764ba7f67c37c3c6452cc06751af') options=('!strip') install='zim.install' @@ -64,8 +64,7 @@ package() { echo "Patching build paths occurrence in: ${entry}" sed -i "s/${pkgdir//\//\\/}//g" "${ZIM_HOME}/${entry}" done - cp zimfw.zsh.patch "${ZIM_HOME}/" - ( cd "${ZIM_HOME}" && patch < zimfw.zsh.patch && rm zimfw.zsh.patch ) + ( cd "${ZIM_HOME}" && patch < "${startdir}/zimfw.zsh.patch" ) find ${ZIM_HOME} -iname "*.old" -type f -exec rm -f \{\} \; # files will be recompiled during installation, when zsh will be executed as root find ${ZIM_HOME} -iname "*.zwc" -type f -exec rm -f \{\} \; diff --git a/zimfw.zsh.patch b/zimfw.zsh.patch index 01ae6269c298..acf44a13c294 100644 --- a/zimfw.zsh.patch +++ b/zimfw.zsh.patch @@ -1,7 +1,7 @@ ---- zimfw.zsh 2021-01-11 22:16:26.000000000 +0100 -+++ zimfw.zsh 2021-01-13 18:59:16.889418467 +0100 -@@ -52,16 +52,13 @@ - +--- zimfw.zsh 2021-07-28 16:45:25.000000000 +1000 ++++ zimfw.zsh 2021-07-28 16:45:25.000000000 +1000 +@@ -52,26 +52,19 @@ + _zimfw_build_init() { local -r ztarget=${ZIM_HOME}/init.zsh - # Force update of init.zsh if it's older than .zimrc @@ -16,12 +16,11 @@ ) ${ztarget} + chmod -R u+rX,g+rX,o+rX "${ZIM_HOME}" &>/dev/null } - + _zimfw_build_login_init() { -@@ -69,10 +66,6 @@ + # Array with unique dirs. ${ZIM_HOME} or any subdirectory should only occur once. local -Ur zscriptdirs=(${ZIM_HOME} ${${_zdirs##${ZIM_HOME}/*}:A}) - local -r zscriptglob=("${^zscriptdirs[@]}/(^*test*/)#*.zsh(|-theme)(N-.)") - local -r ztarget=${ZIM_HOME}/login_init.zsh + local -r zscriptglob=("${^zscriptdirs[@]}/(^*test*/)#*.zsh(|-theme)(N-.)") ztarget=${ZIM_HOME}/login_init.zsh - # Force update of login_init.zsh if it's older than .zimrc - if [[ ${ztarget} -ot ${ZDOTDIR:-${HOME}}/.zimrc ]]; then - command mv -f ${ztarget}{,.old} || return 1 @@ -29,11 +28,11 @@ _zimfw_mv =( print -Rn "() { setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB -@@ -99,6 +92,7 @@ +@@ -98,6 +91,7 @@ } \"\${@}\" " ) ${ztarget} + chmod -R u+rX,g+rX,o+rX "${ZIM_HOME}" &>/dev/null } - + _zimfw_build() { |