Skip to content

Commit bd2d19a

Browse files
mirage335mirage335
committed
Correction. Upstream.
1 parent 298be38 commit bd2d19a

File tree

4 files changed

+106
-28
lines changed

4 files changed

+106
-28
lines changed

‎_lib/ubiquitous_bash‎

‎_prog/core.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _test_build_kernel() {
3939

4040

4141

42-
# ATTRIBUTION-AI: ChatGPT o1 2025-01-11 ... suggested Debian package postprocessing.
42+
# ATTRIBUTION-AI: ChatGPT o1 2025-01-11 , 2025-01-17 ... suggested Debian package postprocessing.
4343
_supplement_kernel_debPkg-dpkg_sequence() {
4444
_messagePlain_nominal 'init: _supplement_kernel_debPkg-dpkg_sequence'
4545

@@ -61,8 +61,13 @@ _supplement_kernel_debPkg-dpkg_sequence() {
6161
_messagePlain_probe_cmd cp -a "$currentConfigDir"/.config "$currentDestination"/
6262
done
6363

64+
65+
sudo -n chown -R root:root "$safeTmp"/kernel-headers
66+
6467
rm -f "$currentFile"
65-
_messagePlain_probe_cmd dpkg-deb -b "$safeTmp"/kernel-headers "$currentFile"
68+
_messagePlain_probe_cmd dpkg-deb --build --root-owner-group "$safeTmp"/kernel-headers "$currentFile"
69+
70+
sudo -n chown -R "$USER":"$USER" "$safeTmp"/kernel-headers
6671

6772
_stop
6873
}

‎compile.sh‎

Lines changed: 17 additions & 2 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='3486323234'
39+
export ub_setScriptChecksum_contents='3480762536'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -780,9 +780,12 @@ then
780780
false
781781
}
782782

783+
# ATTENTION: Sets the priority for '_wsl' as well as 'u' shortcuts. Override with '_bashrc' or similar as desired (eg. replace 'ubdist_embedded' with some specialized 3D printer firwmare/klipper dist/OS, etc).
783784
_wsl() {
784785
local currentBin_wsl
785-
currentBin_wsl=$(type -p wsl)
786+
#currentBin_wsl=$(type -p wsl)
787+
788+
currentBin_wsl="wsl"
786789

787790
if ( [[ "$1" != "-"* ]] || [[ "$1" == "-u" ]] || [[ "$1" == "-e" ]] || [[ "$1" == "--exec" ]] ) && ( [[ "$1" != "-d" ]] || [[ "$2" != "-d" ]] || [[ "$3" != "-d" ]] || [[ "$4" != "-d" ]] || [[ "$5" != "-d" ]] || [[ "$6" != "-d" ]] )
788791
then
@@ -6299,6 +6302,12 @@ _deps_w540() {
62996302
export enUb_w540="true"
63006303
}
63016304

6305+
_deps_gpd() {
6306+
_deps_notLean
6307+
_deps_hardware
6308+
export enUb_gpd="true"
6309+
}
6310+
63026311
_deps_peripherial() {
63036312
_deps_notLean
63046313
_deps_hardware
@@ -6893,6 +6902,7 @@ _compile_bash_deps() {
68936902
_deps_measurement
68946903
_deps_x220t
68956904
_deps_w540
6905+
_deps_gpd
68966906

68976907
_deps_generic
68986908

@@ -7107,6 +7117,7 @@ _compile_bash_deps() {
71077117
#_deps_measurement
71087118
#_deps_x220t
71097119
#_deps_w540
7120+
#_deps_gpd
71107121
#_deps_peripherial
71117122

71127123
#_deps_user
@@ -7211,6 +7222,7 @@ _compile_bash_deps() {
72117222
#_deps_measurement
72127223
#_deps_x220t
72137224
#_deps_w540
7225+
#_deps_gpd
72147226
#_deps_peripherial
72157227

72167228
#_deps_user
@@ -7315,6 +7327,7 @@ _compile_bash_deps() {
73157327
_deps_measurement
73167328
_deps_x220t
73177329
_deps_w540
7330+
_deps_gpd
73187331
_deps_peripherial
73197332

73207333
_deps_user
@@ -7807,6 +7820,8 @@ _compile_bash_hardware() {
78077820
[[ "$enUb_hardware" == "true" ]] && [[ "$enUb_w540" == "true" ]] && includeScriptList+=( "hardware/w540"/w540_fan.sh )
78087821

78097822
[[ "$enUb_hardware" == "true" ]] && [[ "$enUb_peripherial" == "true" ]] && includeScriptList+=( "hardware/peripherial/h1060p"/h1060p.sh )
7823+
7824+
[[ "$enUb_hardware" == "true" ]] && [[ "$enUb_gpd" == "true" ]] && includeScriptList+=( "hardware/gpdWinMini2024_8840U"/gpdWinMini2024_8840U_fan.sh )
78107825

78117826
( [[ "$enUb_hardware" == "true" ]] || [[ "$enUb_measurement" == "true" ]] ) && includeScriptList+=( "hardware/measurement"/live_hash.sh )
78127827
}

‎ubiquitous_bash.sh‎

Lines changed: 81 additions & 23 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='710310540'
39+
export ub_setScriptChecksum_contents='4104823788'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -780,9 +780,12 @@ then
780780
false
781781
}
782782

783+
# ATTENTION: Sets the priority for '_wsl' as well as 'u' shortcuts. Override with '_bashrc' or similar as desired (eg. replace 'ubdist_embedded' with some specialized 3D printer firwmare/klipper dist/OS, etc).
783784
_wsl() {
784785
local currentBin_wsl
785-
currentBin_wsl=$(type -p wsl)
786+
#currentBin_wsl=$(type -p wsl)
787+
788+
currentBin_wsl="wsl"
786789

787790
if ( [[ "$1" != "-"* ]] || [[ "$1" == "-u" ]] || [[ "$1" == "-e" ]] || [[ "$1" == "--exec" ]] ) && ( [[ "$1" != "-d" ]] || [[ "$2" != "-d" ]] || [[ "$3" != "-d" ]] || [[ "$4" != "-d" ]] || [[ "$5" != "-d" ]] || [[ "$6" != "-d" ]] )
788791
then
@@ -5005,7 +5008,30 @@ _fetchDep_debianBookworm_special() {
50055008

50065009
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get remove -y docker docker-engine docker.io docker-ce docker
50075010
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-ce
5008-
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-compose-plugin
5011+
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-compose-plugin
5012+
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-ce
5013+
5014+
5015+
# WARNING: Untested. May cause problems.
5016+
#_getMost_backend_aptGetInstall docker-ce
5017+
##_getMost_backend_aptGetInstall docker-compose-plugin
5018+
#_getMost_backend_aptGetInstall docker-ce
5019+
#_getMost_backend_aptGetInstall docker-buildx-plugin docker-ce-cli docker-ce-rootless-extras
5020+
_getMost_backend apt-get -d install -y docker-ce
5021+
#_getMost_backend apt-get -d install -y docker-compose-plugin
5022+
_getMost_backend apt-get -d install -y docker-ce
5023+
#_getMost_backend apt-get -d install -y docker-buildx-plugin docker-ce-cli docker-ce-rootless-extras
5024+
5025+
# ATTENTION: Speculative . May be untested. Enable if ever necessary.
5026+
#https://docs.docker.com/compose/install/
5027+
#https://docs.docker.com/compose/install/linux/#install-the-plugin-manually
5028+
#if ! _getMost_backend type docker-compose > /dev/null 2>&1
5029+
#then
5030+
#mkdir -p /usr/local/lib/docker/cli-plugins/docker-compose
5031+
#curl -SL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose
5032+
#chmod 755 /usr/local/lib/docker/cli-plugins/docker-compose
5033+
#fi
5034+
50095035

50105036
sudo -n usermod -a -G docker "$USER"
50115037

@@ -5027,6 +5053,7 @@ _fetchDep_debianBookworm_special() {
50275053

50285054
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y atom
50295055

5056+
#return 0
50305057
return 1
50315058
fi
50325059

@@ -5473,7 +5500,7 @@ _fetchDep_debianBullseye_special() {
54735500
return 0
54745501
fi
54755502

5476-
if [[ "$1" == "docker" ]]
5503+
if [[ "$1" == "docker" ]] || [[ "$1" == "docker-compose" ]]
54775504
then
54785505
sudo -n update-alternatives --set iptables /usr/sbin/iptables-legacy
54795506
sudo -n update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
@@ -5519,6 +5546,7 @@ _fetchDep_debianBullseye_special() {
55195546

55205547
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y atom
55215548

5549+
#return 0
55225550
return 1
55235551
fi
55245552

@@ -5984,7 +6012,7 @@ _fetchDep_ubuntuFocalFossa_special() {
59846012
return 0
59856013
fi
59866014

5987-
if [[ "$1" == "docker" ]]
6015+
if [[ "$1" == "docker" ]] || [[ "$1" == "docker-compose" ]]
59886016
then
59896017
sudo -n update-alternatives --set iptables /usr/sbin/iptables-legacy
59906018
sudo -n update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
@@ -6023,14 +6051,15 @@ _fetchDep_ubuntuFocalFossa_special() {
60236051

60246052
if [[ "$1" == "atom" ]]
60256053
then
6026-
curl -L https://packagecloud.io/AtomEditor/atom/gpgkey | sudo -n apt-key add -
6027-
sudo -n sh -c 'echo "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" > /etc/apt/sources.list.d/ub_atom.list'
6054+
#curl -L https://packagecloud.io/AtomEditor/atom/gpgkey | sudo -n apt-key add -
6055+
#sudo -n sh -c 'echo "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" > /etc/apt/sources.list.d/ub_atom.list'
60286056

6029-
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update
6057+
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update
60306058

6031-
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y atom
6059+
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y atom
60326060

6033-
return 0
6061+
#return 0
6062+
return 1
60346063
fi
60356064

60366065
if [[ "$1" == "GL/gl.h" ]] || [[ "$1" == "GL/glext.h" ]] || [[ "$1" == "GL/glx.h" ]] || [[ "$1" == "GL/glxext.h" ]] || [[ "$1" == "GL/dri_interface.h" ]] || [[ "$1" == "x86_64-linux-gnu/pkgconfig/dri.pc" ]]
@@ -6899,14 +6928,28 @@ _getMost_debian11_install() {
68996928
# WARNING: Untested. May be old version of VirtualBox. May conflict with guest additions.
69006929
#_getMost_backend_aptGetInstall virtualbox-6.1
69016930
_getMost_backend apt-get -d install -y virtualbox-6.1
6902-
6903-
6904-
# WARNING: Untested. May cause problems.
6905-
#_getMost_backend_aptGetInstall docker-ce
6906-
#_getMost_backend_aptGetInstall docker-compose-plugin
6907-
_getMost_backend apt-get -d install -y docker-ce
6908-
_getMost_backend apt-get -d install -y docker-compose-plugin
69096931
fi
6932+
6933+
6934+
# WARNING: May be untested. May cause problems.
6935+
#_getMost_backend_aptGetInstall docker-ce
6936+
##_getMost_backend_aptGetInstall docker-compose-plugin
6937+
#_getMost_backend_aptGetInstall docker-ce
6938+
#_getMost_backend_aptGetInstall docker-buildx-plugin docker-ce-cli docker-ce-rootless-extras
6939+
_getMost_backend apt-get -d install -y docker-ce
6940+
#_getMost_backend apt-get -d install -y docker-compose-plugin
6941+
_getMost_backend apt-get -d install -y docker-ce
6942+
#_getMost_backend apt-get -d install -y docker-buildx-plugin docker-ce-cli docker-ce-rootless-extras
6943+
6944+
# ATTENTION: Speculative . May be untested. Enable if ever necessary.
6945+
#https://docs.docker.com/compose/install/
6946+
#https://docs.docker.com/compose/install/linux/#install-the-plugin-manually
6947+
#if ! _getMost_backend type docker-compose > /dev/null 2>&1
6948+
#then
6949+
#mkdir -p /usr/local/lib/docker/cli-plugins/docker-compose
6950+
#curl -SL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose
6951+
#chmod 755 /usr/local/lib/docker/cli-plugins/docker-compose
6952+
#fi
69106953

69116954

69126955
# WARNING: If VirtualBox was not installed by now (eg. due to 'if false' comment block or wrong distribution), this must be called later.
@@ -7101,6 +7144,8 @@ _getMost_debian11_install() {
71017144
_getMost_backend_aptGetInstall python3
71027145
_getMost_backend_aptGetInstall python3.11-venv
71037146
_getMost_backend_aptGetInstall python3-serial
7147+
7148+
#_getMost_backend_aptGetInstall python3-websocket
71047149

71057150

71067151
# blkdiscard
@@ -7800,6 +7845,9 @@ _getMinimal_cloud() {
78007845
_getMost_backend_aptGetInstall bzip2
78017846

78027847
_getMost_backend_aptGetInstall flex
7848+
7849+
_getMost_backend_aptGetInstall imagemagick
7850+
_getMost_backend_aptGetInstall graphicsmagick-imagemagick-compat
78037851

78047852
_getMost_backend_aptGetInstall librecode0
78057853
_getMost_backend_aptGetInstall wkhtmltopdf
@@ -7939,6 +7987,7 @@ _getMinimal_cloud() {
79397987

79407988
_getMost_backend_aptGetInstall debootstrap
79417989

7990+
#_getMost_backend_aptGetInstall qemu-user qemu-utils
79427991
_getMost_backend_aptGetInstall qemu-system-x86
79437992

79447993
_getMost_backend_aptGetInstall cifs-utils
@@ -14161,6 +14210,8 @@ _setupUbiquitous_resize() {
1416114210
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."
1416214211
echo "# Ignored by Cygwin/MSW, etc."
1416314212
echo "type -p resize > /dev/null 2>&1 && resize > /dev/null 2>&1"
14213+
echo "true"
14214+
1416414215
}
1416514216

1416614217
_configureLocal() {
@@ -18631,7 +18682,9 @@ _checkSpecialLocks() {
1863118682
#"$1" == waitOpen function && shift
1863218683
#"$@" == wrapped function and parameters
1863318684
#"$specialLock" == additional lockfile to write
18634-
_open_sequence() {
18685+
_open_procedure() {
18686+
mkdir -p "$scriptLocal"
18687+
1863518688
if _readLocked "$lock_open"
1863618689
then
1863718690
_checkSpecialLocks && return 1
@@ -18678,7 +18731,7 @@ _open_sequence() {
1867818731
_open() {
1867918732
local returnStatus
1868018733

18681-
_open_sequence "$@"
18734+
_open_procedure "$@"
1868218735
returnStatus="$?"
1868318736

1868418737
export specialLock
@@ -18693,7 +18746,7 @@ _open() {
1869318746
#"$1" == waitClose function && shift
1869418747
#"$@" == wrapped function and parameters
1869518748
#"$specialLock" == additional lockfile to remove
18696-
_close_sequence() {
18749+
_close_procedure() {
1869718750
local closeForceEnable
1869818751
closeForceEnable=false
1869918752

@@ -18759,7 +18812,7 @@ _close_sequence() {
1875918812
_close() {
1876018813
local returnStatus
1876118814

18762-
_close_sequence "$@"
18815+
_close_procedure "$@"
1876318816
returnStatus="$?"
1876418817

1876518818
export specialLock
@@ -21158,7 +21211,7 @@ _test_build_kernel() {
2115821211

2115921212

2116021213

21161-
# ATTRIBUTION-AI: ChatGPT o1 2025-01-11 ... suggested Debian package postprocessing.
21214+
# ATTRIBUTION-AI: ChatGPT o1 2025-01-11 , 2025-01-17 ... suggested Debian package postprocessing.
2116221215
_supplement_kernel_debPkg-dpkg_sequence() {
2116321216
_messagePlain_nominal 'init: _supplement_kernel_debPkg-dpkg_sequence'
2116421217

@@ -21180,8 +21233,13 @@ _supplement_kernel_debPkg-dpkg_sequence() {
2118021233
_messagePlain_probe_cmd cp -a "$currentConfigDir"/.config "$currentDestination"/
2118121234
done
2118221235

21236+
21237+
sudo -n chown -R root:root "$safeTmp"/kernel-headers
21238+
2118321239
rm -f "$currentFile"
21184-
_messagePlain_probe_cmd dpkg-deb -b "$safeTmp"/kernel-headers "$currentFile"
21240+
_messagePlain_probe_cmd dpkg-deb --build --root-owner-group "$safeTmp"/kernel-headers "$currentFile"
21241+
21242+
sudo -n chown -R "$USER":"$USER" "$safeTmp"/kernel-headers
2118521243

2118621244
_stop
2118721245
}

0 commit comments

Comments
 (0)