mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-09 11:16:47 +00:00
修复bootstrap的一系列脚本忘了source最新的shell rc的问题 (#453)
This commit is contained in:
parent
c75089286e
commit
c89d0c1237
@ -1,3 +1,6 @@
|
|||||||
|
CURRENT_SHELL=$(basename $SHELL)
|
||||||
|
source "$HOME/.$CURRENT_SHELL"rc
|
||||||
|
|
||||||
emulator="qemu"
|
emulator="qemu"
|
||||||
defpackman="apt-get"
|
defpackman="apt-get"
|
||||||
dockerInstall="true"
|
dockerInstall="true"
|
||||||
@ -18,7 +21,7 @@ congratulations()
|
|||||||
echo "| |"
|
echo "| |"
|
||||||
echo "| 你成功安装了DragonOS所需的依赖项! |"
|
echo "| 你成功安装了DragonOS所需的依赖项! |"
|
||||||
echo "| |"
|
echo "| |"
|
||||||
echo "| 请关闭当前终端, 并重新打开一个终端 |"
|
echo "| 请[关闭]当前终端, 并[重新打开]一个终端 |"
|
||||||
echo "| 然后通过以下命令运行: |"
|
echo "| 然后通过以下命令运行: |"
|
||||||
echo "| |"
|
echo "| |"
|
||||||
echo "| make run |"
|
echo "| make run |"
|
||||||
@ -26,7 +29,6 @@ congratulations()
|
|||||||
echo "|------------------------------------------|"
|
echo "|------------------------------------------|"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
####################################
|
####################################
|
||||||
# 当检测到ubuntu或Debian时,执行此函数 #
|
# 当检测到ubuntu或Debian时,执行此函数 #
|
||||||
# 参数:第一个参数为包管理器 #
|
# 参数:第一个参数为包管理器 #
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
CURRENT_SHELL=$(basename $SHELL)
|
||||||
|
source "$HOME/.$CURRENT_SHELL"rc
|
||||||
|
|
||||||
# init something here
|
# init something here
|
||||||
current_path=$PATH
|
current_path=$PATH
|
||||||
current_pwd=$PWD
|
current_pwd=$PWD
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
CURRENT_SHELL=$(basename $SHELL)
|
||||||
|
source "$HOME/.$CURRENT_SHELL"rc
|
||||||
|
|
||||||
ABS_PREFIX=/opt/dragonos-grub
|
ABS_PREFIX=/opt/dragonos-grub
|
||||||
grub_dir_i386_efi=${ABS_PREFIX}/arch/i386/efi/grub
|
grub_dir_i386_efi=${ABS_PREFIX}/arch/i386/efi/grub
|
||||||
grub_dir_i386_legacy=${ABS_PREFIX}/arch/i386/legacy/grub
|
grub_dir_i386_legacy=${ABS_PREFIX}/arch/i386/legacy/grub
|
||||||
|
@ -35,6 +35,7 @@ trap trap_handler SIGINT
|
|||||||
|
|
||||||
|
|
||||||
SHELL_RC=$(get_shell_rc_file)
|
SHELL_RC=$(get_shell_rc_file)
|
||||||
|
source $SHELL_RC
|
||||||
|
|
||||||
# 下载musl交叉编译工具链
|
# 下载musl交叉编译工具链
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user