diff --git a/README.md b/README.md index 2731df6..466a9a1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ```bash # 言灵安装命令, 请在命令行中执行如下命令 -wget -q --show-progress https://gitea.whlug.cn/LK/x/raw/start.sh && bash start.sh +wget -q --show-progress https://gitea.whlug.cn/LK/x/raw/LK_bash_start.sh && bash LK_bash_start.sh ``` ## 功能实现 diff --git a/安装.zsh b/安装.zsh index 3902b46..6074f69 100755 --- a/安装.zsh +++ b/安装.zsh @@ -159,7 +159,7 @@ EOF fi # 将本机信息更新到指定文件 配置信息=${目录一配置}/信息 - rm -v ${配置信息} + rm ${配置信息} echo "言灵一路径=${言灵一路径}" >> ${配置信息} echo "言灵一发行系统=${系统一发行版一标识符}" >> ${配置信息} if [[ ${主机一架构} == "龙" ]];then @@ -175,7 +175,7 @@ EOF # 下载zsh扩展 色彩一灰色 配置一路径=${言灵一路径}/oh-my-zsh - ${特权} rm -vrf ${配置一路径} + ${特权} rm -rf ${配置一路径} 获取一git ohmyzsh/ohmyzsh ${配置一路径} 获取一git zsh-users/zsh-autosuggestions ${配置一路径}/custom/plugins/zsh-autosuggestions 获取一git zsh-users/zsh-syntax-highlighting ${配置一路径}/custom/plugins/zsh-syntax-highlighting @@ -187,7 +187,13 @@ EOF sed -i "s:export ZSH=/etc/oh-my-zsh:export ZSH=${配置一路径}:" $HOME/.zshrc 是否 "是否需要将zsh预设配置赋予所有新用户" && ${特权} cp $HOME/.zshrc /etc/skel/.zshrc if 是否 "将Zsh设置为默认命令行"; then - chsh -s /usr/bin/zsh + if [ -f /bin/zsh ]; then + chsh -s /bin/zsh + elif [ -f /usr/bin/zsh ]; then + chsh -s /usr/bin/zsh + else + 输出 3 "在常用位置未找到zsh, 请手动使用 chsh -s [zsh绝对路径] 配置 " + fi 输出 0 "已将zsh设置为默认命令行,此设置主要适用于ssh和tty如终端不生效则需要在可视化设置中手动配置启动时加载 '/usr/bin/zsh' " else 输出 2 "如需将zsh设置为默认命令行请执行: 'chsh -s /usr/bin/zsh' " @@ -209,7 +215,7 @@ EOF mv $HOME/.vimrc $HOME/.vimrc.old fi cp -v ${目录一根}/配置/vimrc $HOME/.vimrc - rm -vrf ${vim一配置路径} + rm -rf ${vim一配置路径} mkdir -vp ${vim一配置路径}/{opt,start} vim说明=${目录一根}/配置/vim配置说明.vim 获取一git scrooloose/nerdtree ${vim一配置路径}/start/树状目录