Skip to content

Commit

Permalink
Upstream.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mirage335
mirage335 committed Jan 5, 2025
1 parent 0476f33 commit 5e58716
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion _lib/ubiquitous_bash
Submodule ubiquitous_bash updated 6 files
+12 −11 os/distro/debian/getDep_debian.sh
+2 −2 os/distro/getMinimal.sh
+2 −0 os/distro/getMost.sh
+17 −14 ubcore.sh
+18 −14 ubiquitous_bash.sh
+1 −0 virtualization/docker/dockertest.sh
32 changes: 18 additions & 14 deletions ubiquitous_bash.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ _ub_cksum_special_derivativeScripts_contents() {
#export ub_setScriptChecksum_disable='true'
( [[ -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'
export ub_setScriptChecksum_header='2591634041'
export ub_setScriptChecksum_contents='3955888656'
export ub_setScriptChecksum_contents='2537019314'

# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
# WARNING: Performance may be crucial here.
Expand Down Expand Up @@ -9282,7 +9282,7 @@ _fetchDep_debianBookworm_special() {
return 0
fi

if [[ "$1" == "docker" ]]
if [[ "$1" == "docker" ]] || [[ "$1" == "docker-compose" ]]
then
sudo -n update-alternatives --set iptables /usr/sbin/iptables-legacy
sudo -n update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
Expand All @@ -9307,6 +9307,7 @@ _fetchDep_debianBookworm_special() {

sudo -n env DEBIAN_FRONTEND=noninteractive apt-get remove -y docker docker-engine docker.io docker-ce docker
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-ce
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends -y docker-compose-plugin

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

Expand All @@ -9321,14 +9322,14 @@ _fetchDep_debianBookworm_special() {

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

sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update

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

return 0
return 1
fi

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" ]]
Expand Down Expand Up @@ -9813,14 +9814,14 @@ _fetchDep_debianBullseye_special() {

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

sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update
#sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -y update

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

return 0
return 1
fi

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" ]]
Expand Down Expand Up @@ -11199,7 +11200,9 @@ _getMost_debian11_install() {

# WARNING: Untested. May cause problems.
#_getMost_backend_aptGetInstall docker-ce
#_getMost_backend_aptGetInstall docker-compose-plugin
_getMost_backend apt-get -d install -y docker-ce
_getMost_backend apt-get -d install -y docker-compose-plugin
fi


Expand Down Expand Up @@ -12338,9 +12341,9 @@ _getMinimal_cloud() {

# ATTRIBUTION-AI ChatGPT o1 2025-01-03 ... partially. Seems there is some evidence newer dist/OS versions may be more likely to break by default, 'i386', needed for building MSW installers, etc.
_getMost_backend dpkg --add-architecture i386
#_getMost_backend env DEBIAN_FRONTEND=noninteractive apt-get -y update
_getMost_backend env DEBIAN_FRONTEND=noninteractive apt-get -y update
_getMost_backend_aptGetInstall libc6:i386 lib32z1
_getMost_backend_aptGetInstall wine wine32 wine64 libwine libwine:i386 fonts-wine
#_getMost_backend_aptGetInstall wine wine32 wine64 libwine libwine:i386 fonts-wine



Expand Down Expand Up @@ -22945,6 +22948,7 @@ _test_docker() {
fi

_getDep docker
_getDep docker-compose

local dockerPermission
dockerPermission=$(_permitDocker echo true 2> /dev/null)
Expand Down

0 comments on commit 5e58716

Please sign in to comment.