mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2026-09-18 08:20:10 +00:00
Squashed 'gitstatus/' changes from 0127fd26a..cc956ca78
cc956ca78 interrupt p10k instant prompt before printing "gitstatus failed to initialize" error db3603bc8 improve "gitstatus failed to initialize" error message e164594ea work around bugs in cygwin 55af96ade cleanup + todo 0e70dbc56 add an empty line before the error message git-subtree-dir: gitstatus git-subtree-split: cc956ca7878ef6d00bb1f35861864d0a40ffac75
This commit is contained in:
@@ -151,7 +151,7 @@ done
|
||||
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
(( $# )) || set -- ${(k)assets}
|
||||
(( $# )) || set -- ${(ko)assets}
|
||||
set -- ${(u)@}
|
||||
|
||||
local platform
|
||||
@@ -200,15 +200,22 @@ function build-windows() {
|
||||
|
||||
local tmp env bin intro flags=(-w)
|
||||
case $2 in
|
||||
msys_nt-10.0-i686) bin='msys32/usr/bin';|
|
||||
msys_nt-10.0-x86_64) bin='msys64/usr/bin';|
|
||||
cygwin_nt-10.0-i686) bin='cygwin32/bin' ;|
|
||||
cygwin_nt-10.0-x86_64) bin='cygwin64/bin' ;|
|
||||
msys_nt-10.0-i686) bin='msys32/usr/bin';|
|
||||
msys_nt-10.0-x86_64) bin='msys64/usr/bin';|
|
||||
cygwin_nt-10.0-*)
|
||||
tmp='/cygdrive/c/tmp'
|
||||
;|
|
||||
msys_nt-10.0-*)
|
||||
flags+=(-s)
|
||||
tmp='/c/tmp'
|
||||
env='MSYSTEM=MSYS'
|
||||
intro='pacman -Syu --noconfirm; pacman -S --needed --noconfirm git; '
|
||||
intro+='PATH="$PATH:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"'
|
||||
while true; do
|
||||
# TODO: run autorebase only when getting an error that can be fixed by autorebasing.
|
||||
break
|
||||
local out
|
||||
out="$(ssh $1 cmd.exe "$c/${bin%%/*}/autorebase.bat" 2>&1)"
|
||||
[[ $out == *"The following DLLs couldn't be rebased"* ]] || break
|
||||
@@ -243,12 +250,7 @@ function build-windows() {
|
||||
}
|
||||
done
|
||||
} "$@"
|
||||
intro='pacman -Syu --noconfirm; pacman -S --needed --noconfirm git; '
|
||||
intro+='PATH="$PATH:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"'
|
||||
;;
|
||||
cygwin_nt-10.0-*)
|
||||
tmp='/cygdrive/c/tmp'
|
||||
;;
|
||||
;|
|
||||
esac
|
||||
|
||||
ssh $1 $c/$bin/env.exe $env c:/$bin/bash.exe -l <<<"
|
||||
|
||||
Reference in New Issue
Block a user