From fb90f9513d279e3296547659a3bd7a28a62a60ea Mon Sep 17 00:00:00 2001
From: shaoying <shaoying@zuoyebang.com>
Date: Wed, 22 Apr 2020 13:20:22 +0800
Subject: [PATCH] opt some

---
 etc/conf/bashrc |  2 +-
 etc/conf/ishrc  | 12 ++++--------
 etc/conf/sh.vim |  1 +
 etc/conf/zshrc  |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/etc/conf/bashrc b/etc/conf/bashrc
index 7f30a03a..dd48a3e4 100644
--- a/etc/conf/bashrc
+++ b/etc/conf/bashrc
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-[ -f ~/.ishrc ] && source ~/.ishrc
+[ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh
 
diff --git a/etc/conf/ishrc b/etc/conf/ishrc
index 6d1f0582..82eceb23 100644
--- a/etc/conf/ishrc
+++ b/etc/conf/ishrc
@@ -4,7 +4,7 @@ ISH_LOG=${ISH_LOG:="/dev/null"}
 ISH_PATH=${ISH_PATH:="$PWD/.ish/pluged"}
 ISH_ROOT=${ISH_ROOT:="$HOME/.ish/pluged"}
 ISH_HUB=${ISH_HUB:="github.com"}
-ISH_FTP=${ISH_FTP:="https"}
+ISH_FTP=${ISH_FTP:="https|http"}
 ISH_INIT=${ISH_INIT:="init.sh"}
 ISH_EXIT=${ISH_EXIT:="exit.sh"}
 ISH_ORDER=${ISH_ORDER:=0}
@@ -21,13 +21,9 @@ require() {
 
     # 下载脚本
     local p="${name%%/*}" && p=${p%:} && case "$p" in
-        ${ISH_FTP})
-            local pp=$ISH_PATH/$(_name $name)
-            if ! [ -f $pp/$init ]; then
-                mkdir -p $pp && wget $name/$init -O $pp/$init
-            fi
-            name=$(_name $name)
-            ;;
+        ${ISH_FTP}) local pp=$ISH_PATH/$(_name $name)
+            if ! [ -f $pp/$init ]; then mkdir -p $pp && wget $name/$init -O $pp/$init; fi
+            name=$(_name $name) ;;
         $ISH_HUB) [ -d "$ISH_PATH/$name/.git" ] || git clone https://$name $ISH_PATH/$name;;
     esac
 
diff --git a/etc/conf/sh.vim b/etc/conf/sh.vim
index 0f3cca0b..db5b500e 100644
--- a/etc/conf/sh.vim
+++ b/etc/conf/sh.vim
@@ -3,4 +3,5 @@ syntax match ishKey "^require"
 syntax match ishKey "^module"
 syntax match ishKey "^script"
 syntax match ishKey "^object"
+set foldmarker={,}
 
diff --git a/etc/conf/zshrc b/etc/conf/zshrc
index c10e4b5f..cf751017 100644
--- a/etc/conf/zshrc
+++ b/etc/conf/zshrc
@@ -90,7 +90,7 @@ export PROMPT=$LOCAL_PROMPT'%![%*]%c$ '
 export EDITOR=vim
 
 [ -f ~/.zsh_local ] && source ~/.zsh_local
-[ -f ~/.ishrc ] && source ~/.ishrc
+[ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh
 
 bindkey -e
 bindkey jk accept-line