Skip to content

Commit c5f52e9

Browse files
committed
Upstream.
1 parent 922a68d commit c5f52e9

File tree

3 files changed

+46
-5
lines changed

3 files changed

+46
-5
lines changed

compile.sh

Lines changed: 30 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='575845187'
39+
export ub_setScriptChecksum_contents='3075555629'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -6033,6 +6033,7 @@ _deps_search() {
60336033
_deps_cloud() {
60346034
_deps_repo
60356035
_deps_proxy
6036+
_deps_serial
60366037
_deps_stopwatch
60376038

60386039
_deps_fakehome
@@ -6100,6 +6101,12 @@ _deps_proxy_special() {
61006101
export enUb_proxy_special="true"
61016102
}
61026103

6104+
_deps_serial() {
6105+
_deps_notLean
6106+
6107+
export enUb_serial="true"
6108+
}
6109+
61036110
_deps_fw() {
61046111
export enUb_fw="true"
61056112
}
@@ -6260,6 +6267,7 @@ _deps_command() {
62606267
_deps_os_x11
62616268
_deps_proxy
62626269
_deps_proxy_special
6270+
_deps_serial
62636271

62646272
export enUb_command="true"
62656273
}
@@ -6835,6 +6843,10 @@ _compile_bash_deps() {
68356843

68366844
#_deps_virt_translation
68376845

6846+
# Serial depends on '_getMost_backend', which explicitly requires only 'notLean' .
6847+
#_deps_notLean
6848+
#_deps_serial
6849+
68386850
_deps_stopwatch
68396851

68406852
_deps_queue
@@ -6846,6 +6858,8 @@ _compile_bash_deps() {
68466858
if [[ "$1" == "ubcore" ]]
68476859
then
68486860
_deps_notLean
6861+
6862+
_deps_serial
68496863

68506864
_deps_fw
68516865

@@ -6905,6 +6919,8 @@ _compile_bash_deps() {
69056919
_deps_proxy
69066920
_deps_proxy_special
69076921

6922+
_deps_serial
6923+
69086924
_deps_fw
69096925

69106926
_deps_clog
@@ -6956,6 +6972,8 @@ _compile_bash_deps() {
69566972
_deps_queue
69576973
_deps_metaengine
69586974

6975+
_deps_serial
6976+
69596977
_deps_stopwatch
69606978

69616979
return 0
@@ -6979,6 +6997,8 @@ _compile_bash_deps() {
69796997

69806998
_deps_abstractfs
69816999

7000+
_deps_serial
7001+
69827002
_deps_stopwatch
69837003

69847004
return 0
@@ -7004,6 +7024,8 @@ _compile_bash_deps() {
70047024
_deps_fakehome
70057025
_deps_abstractfs
70067026

7027+
_deps_serial
7028+
70077029
_deps_stopwatch
70087030

70097031
return 0
@@ -7092,6 +7114,7 @@ _compile_bash_deps() {
70927114

70937115
#_deps_proxy
70947116
#_deps_proxy_special
7117+
_deps_serial
70957118

70967119
_deps_fw
70977120

@@ -7195,6 +7218,7 @@ _compile_bash_deps() {
71957218

71967219
#_deps_proxy
71977220
#_deps_proxy_special
7221+
_deps_serial
71987222

71997223
_deps_fw
72007224

@@ -7298,6 +7322,7 @@ _compile_bash_deps() {
72987322

72997323
_deps_proxy
73007324
_deps_proxy_special
7325+
_deps_serial
73017326

73027327
_deps_fw
73037328

@@ -7431,6 +7456,10 @@ _compile_bash_utilities() {
74317456

74327457
[[ "$enUb_proxy" == "true" ]] && includeScriptList+=( "generic/net/proxy/proxyrouter"/here_proxyrouter.sh )
74337458
[[ "$enUb_proxy" == "true" ]] && includeScriptList+=( "generic/net/proxy/proxyrouter"/proxyrouter.sh )
7459+
7460+
[[ "$enUb_serial" == "true" ]] && includeScriptList+=( "generic/serial"/forwardPort.sh )
7461+
[[ "$enUb_serial" == "true" ]] && includeScriptList+=( "generic/serial"/forwardPort-service.sh )
7462+
[[ "$enUb_serial" == "true" ]] && includeScriptList+=( "generic/serial"/terminal.sh )
74347463

74357464
[[ "$enUb_fw" == "true" ]] && includeScriptList+=( "generic/net/fw"/fw.sh )
74367465
[[ "$enUb_fw" == "true" ]] && includeScriptList+=( "generic/net/fw"/hosts.sh )

ubiquitous_bash.sh

Lines changed: 15 additions & 3 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='1517939328'
39+
export ub_setScriptChecksum_contents='3886345466'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -6737,6 +6737,11 @@ _getMost_debian11_install() {
67376737

67386738

67396739
_getMost_backend_aptGetInstall xvfb
6740+
6741+
# terminal-serial: agetty, screen, resize
6742+
_getMost_backend_aptGetInstall util-linux
6743+
_getMost_backend_aptGetInstall screen
6744+
_getMost_backend_aptGetInstall xterm
67406745

67416746
#_getMost_backend_aptGetInstall original-awk
67426747
_getMost_backend_aptGetInstall gawk
@@ -14118,7 +14123,6 @@ export profileScriptFolder="$ubcoreUBdir"
1411814123
[[ "\$scriptAbsoluteLocation" == "" ]] && . "\$profileScriptLocation" --profile _importShortcuts
1411914124
[[ "\$ub_setScriptChecksum_disable" == 'true' ]] && export ub_setScriptChecksum_disable="" && unset ub_setScriptChecksum_disable
1412014125

14121-
1412214126
# Returns priority to normal.
1412314127
# Greater or equal, '_priority_app_pid_root' .
1412414128
#ionice -c 2 -n 3 -p \$\$
@@ -14189,6 +14193,14 @@ fi
1418914193
CZXWXcRMTo8EmM8i4d
1419014194
}
1419114195

14196+
14197+
14198+
_setupUbiquitous_resize() {
14199+
echo "# Hardware serial terminals connected through screen require explicit resize to change number of columns/lines. Usually doing this once will at least increase the usable 'screen real estate' from the very small defaults."
14200+
echo "# Ignored by Cygwin/MSW, etc."
14201+
echo "type -p resize > /dev/null 2>&1 && resize > /dev/null 2>&1"
14202+
}
14203+
1419214204
_configureLocal() {
1419314205
_configureFile "$1" "_local"
1419414206
}
@@ -14386,7 +14398,7 @@ _setupUbiquitous() {
1438614398
_setupUbiquitous_bashProfile_here >> "$HOME"/.bash_profile
1438714399
fi
1438814400

14389-
14401+
_setupUbiquitous_resize >> "$ubcoreFile"
1439014402

1439114403

1439214404
_messageNormal "install: setupUbiquitous_accessories"

0 commit comments

Comments
 (0)