Fix upgrade not working properly
This commit is contained in:
parent
1facc5d698
commit
677346d3cc
@ -112,10 +112,14 @@ function rbash_cache {
|
||||
}
|
||||
|
||||
_RBASH_LOADED=
|
||||
if [ ! -d "$RBASH_SOURCES" ]; then
|
||||
_RBASH_MERGE_START=1
|
||||
fi
|
||||
|
||||
function rbash_load {
|
||||
local f path
|
||||
|
||||
if [ -z "$_RBASH_UPGRADE" ]; then
|
||||
if [ -z "$_RBASH_MERGE_START" ]; then
|
||||
if [ -n "$_RBASH_LOADED" ]; then
|
||||
return 0
|
||||
fi
|
||||
@ -173,9 +177,7 @@ function rbash-upgrade {
|
||||
rm -r "$RBASH_SOURCES"
|
||||
fi
|
||||
|
||||
_RBASH_UPGRADE=1
|
||||
source $__SCRIPT
|
||||
unset _RBASH_UPGRADE
|
||||
}
|
||||
|
||||
function rbash-run {
|
||||
@ -286,6 +288,7 @@ rbash_load "sources/40_go-command"
|
||||
rbash_load "sources/41_pivot-command"
|
||||
___DEFAULT___
|
||||
chmod 600 "$RBASH_CONFIG"
|
||||
unset _RBASH_MERGE_START
|
||||
fi
|
||||
|
||||
source "$RBASH_CONFIG"
|
||||
|
Loading…
Reference in New Issue
Block a user