diff --git a/start.sh b/start.sh index 1c8892a..b003bb5 100755 --- a/start.sh +++ b/start.sh @@ -132,3 +132,6 @@ Install_Zsh [[ "$@" == *-x* ]] || Download_X (( $X_START == 1 )) && zsh $x_dir/安装.zsh exec zsh +# 写入配置文件 +mkdir -p $HOME/.config/xunmi +echo "寻觅=$ROOT_INSTALL" > $HOME/.config/xunmi/PATH.sh diff --git a/安装.zsh b/安装.zsh index 82d6afc..45a2400 100755 --- a/安装.zsh +++ b/安装.zsh @@ -142,10 +142,18 @@ echo " * 欢迎使用 言灵 配置脚本 * *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* " +目录_根=$PWD +# 判断当前执行的位置 如果不再项目路径中就去寻找路径 +if [ ! -f "公共/函数.zsh" ]; then + source $HOME/.config/xunmi/* + 目录_根=${寻觅}/x + cd ${寻觅}/x || exit 1 +fi +echo "执行目录: ${目录_根}" # 先检查相关 -[[ ${言灵_函数} == 1 ]] || . 公共/函数.zsh || exit 1 && 输出 0 "公共函数模块初始化完成" -[[ ${言灵_包管} == 1 ]] || . 公共/包管.zsh || exit 2 && 输出 0 "包管理器模块初始化完成" +[[ ${言灵_函数} == 1 ]] || . 公共/函数.zsh || exit 2 && 输出 0 "公共函数模块初始化完成" +[[ ${言灵_包管} == 1 ]] || . 公共/包管.zsh || exit 3 && 输出 0 "包管理器模块初始化完成" 配置检测