Skip to content

Commit e8f51f3

Browse files
committed
Upstream.
1 parent 8389cd2 commit e8f51f3

File tree

3 files changed

+150
-29
lines changed

3 files changed

+150
-29
lines changed

_lib/ubiquitous_bash

compile.sh

Lines changed: 32 additions & 1 deletion
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='831458312'
39+
export ub_setScriptChecksum_contents='1885717462'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -1246,6 +1246,25 @@ then
12461246
kwrite() {
12471247
kate -n "$@"
12481248
}
1249+
1250+
_aria2c_cygwin_overide() {
1251+
if _safeEcho_newline "$@" | grep '\--async-dns' > /dev/null
1252+
then
1253+
aria2c "$@"
1254+
return
1255+
else
1256+
aria2c --async-dns=false "$@"
1257+
return
1258+
fi
1259+
}
1260+
alias aria2c=_aria2c_cygwin_overide
1261+
1262+
##! type -p wslg
1263+
#[[ -e '/cygdrive/c/WINDOWS/system32/wslg.exe' ]] && wsl() { '/cygdrive/c/WINDOWS/system32/wslg.exe' "$@" ; }
1264+
[[ -e '/cygdrive/c/Program Files/WSL/wslg.exe' ]] && wslg() { '/cygdrive/c/Program Files/WSL/wslg.exe' "$@" ; }
1265+
##! type -p wsl
1266+
#[[ -e '/cygdrive/c/WINDOWS/system32/wsl.exe' ]] && wsl() { '/cygdrive/c/WINDOWS/system32/wsl.exe' "$@" ; }
1267+
[[ -e '/cygdrive/c/Program Files/WSL/wsl.exe' ]] && wsl() { '/cygdrive/c/Program Files/WSL/wsl.exe' "$@" ; }
12491268
fi
12501269
12511270
# WARNING: What is otherwise considered bad practice may be accepted to reduce substantial MSW/Cygwin inconvenience .
@@ -6255,6 +6274,11 @@ _deps_hardware() {
62556274
export enUb_hardware="true"
62566275
}
62576276

6277+
_deps_measurement() {
6278+
_deps_hardware
6279+
export enUb_measurement="true"
6280+
}
6281+
62586282
_deps_x220t() {
62596283
_deps_notLean
62606284
_deps_hardware
@@ -6852,6 +6876,7 @@ _compile_bash_deps() {
68526876
_deps_linux
68536877

68546878
_deps_hardware
6879+
_deps_measurement
68556880
_deps_x220t
68566881
_deps_w540
68576882

@@ -7057,6 +7082,7 @@ _compile_bash_deps() {
70577082
#_deps_synergy
70587083

70597084
#_deps_hardware
7085+
#_deps_measurement
70607086
#_deps_x220t
70617087
#_deps_w540
70627088
#_deps_peripherial
@@ -7159,6 +7185,7 @@ _compile_bash_deps() {
71597185
#_deps_synergy
71607186

71617187
#_deps_hardware
7188+
#_deps_measurement
71627189
#_deps_x220t
71637190
#_deps_w540
71647191
#_deps_peripherial
@@ -7261,6 +7288,7 @@ _compile_bash_deps() {
72617288
_deps_synergy
72627289

72637290
_deps_hardware
7291+
_deps_measurement
72647292
_deps_x220t
72657293
_deps_w540
72667294
_deps_peripherial
@@ -7611,6 +7639,7 @@ _compile_bash_shortcuts() {
76117639

76127640
( [[ "$enUb_dev_heavy" == "true" ]] || [[ "$enUb_repo" == "true" ]] || [[ "$enUb_cloud" == "true" ]] ) && includeScriptList+=( "shortcuts/dev/app/repo/mktorrent"/mktorrent.sh )
76137641
( [[ "$enUb_notLean" == "true" ]] || [[ "$enUb_dev" == "true" ]] || [[ "$enUb_dev_heavy" == "true" ]] || [[ "$enUb_image" == "true" ]] || [[ "$enUb_repo" == "true" ]] || [[ "$enUb_cloud" == "true" ]] ) && includeScriptList+=( "shortcuts/dev/app/repo/disk"/dd.sh )
7642+
( [[ "$enUb_notLean" == "true" ]] || [[ "$enUb_dev" == "true" ]] || [[ "$enUb_dev_heavy" == "true" ]] || [[ "$enUb_image" == "true" ]] || [[ "$enUb_repo" == "true" ]] || [[ "$enUb_cloud" == "true" ]] ) && includeScriptList+=( "shortcuts/dev/app/repo/disc"/growisofs.sh )
76147643

76157644

76167645
( [[ "$enUb_dev_heavy" == "true" ]] || [[ "$enUb_search" == "true" ]] ) && includeScriptList+=( "shortcuts/dev/app/search"/search.sh )
@@ -7749,6 +7778,8 @@ _compile_bash_hardware() {
77497778
[[ "$enUb_hardware" == "true" ]] && [[ "$enUb_w540" == "true" ]] && includeScriptList+=( "hardware/w540"/w540_fan.sh )
77507779

77517780
[[ "$enUb_hardware" == "true" ]] && [[ "$enUb_peripherial" == "true" ]] && includeScriptList+=( "hardware/peripherial/h1060p"/h1060p.sh )
7781+
7782+
( [[ "$enUb_hardware" == "true" ]] || [[ "$enUb_measurement" == "true" ]] ) && includeScriptList+=( "hardware/measurement"/live_hash.sh )
77527783
}
77537784

77547785
_compile_bash_vars_basic() {

0 commit comments

Comments
 (0)