penguin/utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix upgrade not working properly

Browse Source
This commit is contained in:
斟酌 鵬兄 2022-08-12 00:07:57 +08:00
parent 1facc5d698
commit 677346d3cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bash/bashrc/rbashrc
View File

@ -112,10 +112,14 @@ function rbash_cache {
} }
_RBASH_LOADED= _RBASH_LOADED=
if [ ! -d "$RBASH_SOURCES" ]; then
_RBASH_MERGE_START=1
fi
function rbash_load { function rbash_load {
local f path local f path
if [ -z "$_RBASH_UPGRADE" ]; then if [ -z "$_RBASH_MERGE_START" ]; then
if [ -n "$_RBASH_LOADED" ]; then if [ -n "$_RBASH_LOADED" ]; then
return 0 return 0
fi fi
@ -173,9 +177,7 @@ function rbash-upgrade {
rm -r "$RBASH_SOURCES" rm -r "$RBASH_SOURCES"
fi fi
_RBASH_UPGRADE=1
source $__SCRIPT source $__SCRIPT
unset _RBASH_UPGRADE
} }
function rbash-run { function rbash-run {
@ -286,6 +288,7 @@ rbash_load "sources/40_go-command"
rbash_load "sources/41_pivot-command" rbash_load "sources/41_pivot-command"
___DEFAULT___ ___DEFAULT___
chmod 600 "$RBASH_CONFIG" chmod 600 "$RBASH_CONFIG"
unset _RBASH_MERGE_START
fi fi
source "$RBASH_CONFIG" source "$RBASH_CONFIG"