diff options
author | romkatv <roman.perepelitsa@gmail.com> | 2020-02-16 11:24:14 +0300 |
---|---|---|
committer | romkatv <roman.perepelitsa@gmail.com> | 2020-02-16 11:24:14 +0300 |
commit | 1061d1c5163d90a51928c7fe7fb5970444a36e61 (patch) | |
tree | 757753dc09554d43671eff244bc0b4b3df3e4c37 /internal | |
parent | 53c63c9dfcf929ed8867f59f83450d7f343c8d43 (diff) | |
parent | cc796d9cda9afef87455fe35e9c984cf0e97e3f4 (diff) |
Merge branch 'readonly-fix' of https://github.com/Brettm12345/powerlevel10k into Brettm12345-readonly-fix
Diffstat (limited to 'internal')
-rw-r--r-- | internal/configure.zsh | 5 | ||||
-rwxr-xr-x | internal/wizard.zsh | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/internal/configure.zsh b/internal/configure.zsh index 8a21c639..39429f98 100644 --- a/internal/configure.zsh +++ b/internal/configure.zsh @@ -43,10 +43,7 @@ function _p9k_can_configure() { $0_error "$__p9k_zshrc_u is not readable" return 1 } - [[ ! -e $__p9k_zshrc || -w $__p9k_zshrc ]] || { - $0_error "$__p9k_zshrc_u is not writable" - return 1 - } + (( LINES >= __p9k_wizard_lines && COLUMNS >= __p9k_wizard_columns )) || { $0_error "terminal size too small; must be at least $__p9k_wizard_columns x $__p9k_wizard_lines" return 1 diff --git a/internal/wizard.zsh b/internal/wizard.zsh index 8162b7c2..a4790098 100755 --- a/internal/wizard.zsh +++ b/internal/wizard.zsh @@ -1506,6 +1506,7 @@ function ask_zshrc_edit() { r) return 1;; n) return 0;; y) + [[ ! -e $__p9k_zshrc || -w $__p9k_zshrc ]] || (echo "Zshrc is readonly ignoring..."; return 1) write_zshrc=1 if [[ -n $zshrc_content ]]; then zshrc_backup="$(mktemp ${TMPDIR:-/tmp}/.zshrc.XXXXXXXXXX)" || quit -c |