Skip to content

Commit 1150183

Browse files
committed
Upstream.
1 parent 42a3436 commit 1150183

File tree

4 files changed

+622
-13
lines changed

4 files changed

+622
-13
lines changed

compile.sh

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _ub_cksum_special_derivativeScripts_contents() {
3636
#export ub_setScriptChecksum_disable='true'
3737
( [[ -e "$0".nck ]] || [[ "${BASH_SOURCE[0]}" != "${0}" ]] || [[ "$1" == '--profile' ]] || [[ "$1" == '--script' ]] || [[ "$1" == '--call' ]] || [[ "$1" == '--return' ]] || [[ "$1" == '--devenv' ]] || [[ "$1" == '--shell' ]] || [[ "$1" == '--bypass' ]] || [[ "$1" == '--parent' ]] || [[ "$1" == '--embed' ]] || [[ "$1" == '--compressed' ]] || [[ "$0" == "/bin/bash" ]] || [[ "$0" == "-bash" ]] || [[ "$0" == "/usr/bin/bash" ]] || [[ "$0" == "bash" ]] ) && export ub_setScriptChecksum_disable='true'
3838
export ub_setScriptChecksum_header='2591634041'
39-
export ub_setScriptChecksum_contents='3412969308'
39+
export ub_setScriptChecksum_contents='2868637459'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -1675,7 +1675,7 @@ _mitigate-ubcp_rewrite_procedure() {
16751675
fi
16761676
fi
16771677
1678-
1678+
[[ -e "$processedLinkDirective" ]] && rm -f "$currentLinkFolder"/"$currentLinkFile"
16791679
16801680
ln -sf "$processedLinkDirective" "$currentLinkFolder"/"$currentLinkFile"
16811681
@@ -1887,10 +1887,10 @@ _mitigate-ubcp_directory() {
18871887
_mitigate-ubcp() {
18881888
export mitigate_ubcp_modifySymlink='true'
18891889
export mitigate_ubcp_replaceSymlink='false'
1890-
_mitigate-ubcp_directory "$@"
1890+
"$scriptAbsoluteLocation" _mitigate-ubcp_directory "$@"
18911891
18921892
export mitigate_ubcp_replaceSymlink='true'
1893-
_mitigate-ubcp_directory "$@"
1893+
"$scriptAbsoluteLocation" _mitigate-ubcp_directory "$@"
18941894
}
18951895
18961896
@@ -3945,6 +3945,7 @@ _messageFAIL() {
39453945
_messageError "FAIL"
39463946
#echo " FAIL "
39473947
_stop 1
3948+
exit 1
39483949
return 0
39493950
}
39503951

@@ -7738,6 +7739,8 @@ _compile_bash_utilities_virtualization() {
77387739
[[ "$enUb_ChRoot" == "true" ]] && includeScriptList+=( "virtualization/chroot"/userchroot.sh )
77397740
[[ "$enUb_ChRoot" == "true" ]] && includeScriptList+=( "virtualization/chroot"/dropchroot.sh )
77407741

7742+
[[ "$enUb_ChRoot" == "true" ]] && includeScriptList+=( "virtualization/chroot"/ubdistchroot.sh )
7743+
77417744
[[ "$enUb_bios" == "true" ]] && includeScriptList+=( "virtualization/bios"/createvm.sh )
77427745
[[ "$enUb_bios" == "true" ]] && includeScriptList+=( "virtualization/bios"/live.sh )
77437746

@@ -7834,6 +7837,8 @@ _compile_bash_shortcuts() {
78347837

78357838
includeScriptList+=( "shortcuts/git"/gitBest.sh )
78367839
includeScriptList+=( "shortcuts/git"/wget_githubRelease_internal.sh )
7840+
7841+
( [[ "$enUb_github" == "true" ]] || [[ "$enUb_notLean" == "true" ]] || [[ "$enUb_cloud" == "true" ]] || [[ "$enUb_cloud_heavy" == "true" ]] || [[ "$enUb_cloud_self" == "true" ]] ) && includeScriptList+=( "shortcuts/git"/gitCompendium.sh )
78377842

78387843
[[ "$enUb_bup" == "true" ]] && includeScriptList+=( "shortcuts/bup"/bup.sh )
78397844

@@ -8721,6 +8726,33 @@ then
87218726
fi
87228727
fi
87238728

8729+
8730+
# ATTENTION: May be redundantly redefined (ie. overloaded) if appropriate (eg. for use outside a 'ubiquitous_bash' environment).
8731+
_backend_override() {
8732+
! type -f _backend > /dev/null 2>&1 && _backend() { "$@" ; unset -f _backend ; }
8733+
_backend "$@"
8734+
}
8735+
## ...
8736+
## EXAMPLE
8737+
#! _openChRoot && _messageFAIL
8738+
## ...
8739+
#_backend() { _ubdistChRoot "$@" ; }
8740+
#_backend_override echo test
8741+
#unset -f _backend
8742+
## ...
8743+
#! _closeChRoot && _messageFAIL
8744+
## ...
8745+
## EXAMPLE
8746+
#_ubdistChRoot_backend_begin
8747+
#_backend_override echo test
8748+
#_ubdistChRoot_backend_end
8749+
## ...
8750+
## EXAMPLE
8751+
#_experiment() { _backend_override echo test ; }
8752+
#_ubdistChRoot_backend _experiment
8753+
8754+
8755+
87248756
#wsl '~/.ubcore/ubiquitous_bash/ubiquitous_bash.sh' '_wrap' kwrite './gpl-3.0.txt'
87258757
#wsl '~/.ubcore/ubiquitous_bash/ubiquitous_bash.sh' '_wrap' ldesk
87268758
_wrap() {

0 commit comments

Comments
 (0)