Skip to content

Commit 5c5e4a7

Browse files
committed
Upstream.
1 parent b9d1eb8 commit 5c5e4a7

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

ubiquitous_bash.sh

+20-7
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='82982186'
39+
export ub_setScriptChecksum_contents='579031175'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -31650,7 +31650,8 @@ _test_croc_upstream() {
3165031650
! _wantSudo && return 1
3165131651

3165231652
echo
31653-
curl https://getcroc.schollz.com | bash
31653+
#curl https://getcroc.schollz.com | bash
31654+
curl -fsSL 'https://getcroc.schollz.com' | bash
3165431655
echo
3165531656
}
3165631657

@@ -31666,6 +31667,8 @@ _test_croc() {
3166631667
then
3166731668
_messagePlain_request 'ignore: upstream progress ->'
3166831669

31670+
curl -fsSL 'https://getcroc.schollz.com' | head -n 30
31671+
3166931672
_test_croc_upstream "$@"
3167031673
#_test_croc_upstream_beta "$@"
3167131674

@@ -55855,11 +55858,11 @@ _create_ingredientVM_online() {
5585555858

5585655859

5585755860
_messagePlain_nominal '_get_veracrypt'
55858-
_create_ingredientVM_ubiquitous_bash '_get_veracrypt' 2> >(tail -n 200 >&2)
55861+
_create_ingredientVM_ubiquitous_bash '_get_veracrypt' 2> >(tail -n 30 >&2)
5585955862

5586055863

5586155864
_messagePlain_nominal 'ollama install'
55862-
curl -fsSL https://ollama.com/install.sh | _chroot sudo -n -u user sh 2> >(tail -n 150 >&2)
55865+
curl -fsSL https://ollama.com/install.sh | _chroot sudo -n -u user sh 2> >(tail -n 30 >&2)
5586355866

5586455867

5586555868
_messagePlain_nominal 'nix package manager'
@@ -56113,9 +56116,19 @@ _create_ingredientVM_ubiquitous_bash-rm() {
5611356116

5611456117

5611556118

56116-
56117-
56118-
56119+
_openChRoot_ingredient() {
56120+
# WARNING: Variable "$scriptLocal" will be defined differently, if at all, in an interactive shell outside the context of this script.
56121+
# Thus, this function exists mostly to provide access to the "_openChRoot" command with the 'ubVirtImageOverride' variable coorrectly set, with the bonus of not changing with the user's 'ubVirtImageOverride' variable.
56122+
export ubVirtImageOverride="$scriptLocal"/"vm-ingredient.img"
56123+
"$scriptAbsoluteLocation" _openChRoot "$@"
56124+
}
56125+
#--force
56126+
_closeChRoot_ingredient() {
56127+
# WARNING: Variable "$scriptLocal" will be defined differently, if at all, in an interactive shell outside the context of this script.
56128+
# Thus, this function exists mostly to provide access to the "_openChRoot" command with the 'ubVirtImageOverride' variable coorrectly set, with the bonus of not changing with the user's 'ubVirtImageOverride' variable.
56129+
export ubVirtImageOverride="$scriptLocal"/"vm-ingredient.img"
56130+
"$scriptAbsoluteLocation" _closeChRoot "$@"
56131+
}
5611956132

5612056133
_create_ingredientVM_experiment() {
5612156134
type _if_cygwin > /dev/null 2>&1 && _if_cygwin && _messagePlain_warn 'warn: _if_cygwin' && _stop 1

0 commit comments

Comments
 (0)