Upstream.

soaringDistributions · Dec 22, 2024 · 6c4d523 · 6c4d523
1 parent 96a43e2
commit 6c4d523
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 2 deletions.
diff --git a/.github/workflows/zCustom.yml b/.github/workflows/zCustom.yml
@@ -151,6 +151,11 @@ jobs:
           remove-codeql: 'true'
           #remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
           remove-docker-images: 'true'
+      - name: df
+        shell: bash
+        run: |
+          df -h
+          df -h /
       # https://github.com/orgs/community/discussions/8305
       # https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
       # https://github.com/actions/runner-images/discussions/7191
@@ -567,6 +572,11 @@ jobs:
           remove-codeql: 'true'
           #remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
           remove-docker-images: 'true'
+      - name: df
+        shell: bash
+        run: |
+          df -h
+          df -h /
       - name: _getCore_ub
         shell: bash
         timeout-minutes: 90
@@ -924,6 +934,11 @@ jobs:
           remove-codeql: 'true'
           #remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
           remove-docker-images: 'true'
+      - name: df
+        shell: bash
+        run: |
+          df -h
+          df -h /
       - name: _getCore_ub
         shell: bash
         run: |
@@ -1106,6 +1121,11 @@ jobs:
           remove-codeql: 'true'
           #remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
           remove-docker-images: 'true'
+      - name: df
+        shell: bash
+        run: |
+          df -h
+          df -h /
       # https://github.com/orgs/community/discussions/8305
       # https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
       # https://github.com/actions/runner-images/discussions/7191
@@ -1328,6 +1348,11 @@ jobs:
           remove-codeql: 'true'
           #remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
           remove-docker-images: 'true'
+      - name: df
+        shell: bash
+        run: |
+          df -h
+          df -h /
           
       - name: _getCore_ub
         shell: bash

diff --git a/_lib/ubDistBuild b/_lib/ubDistBuild
diff --git a/_prog/build-special.sh b/_prog/build-special.sh
@@ -181,6 +181,17 @@ _build_ubDistBuild-fetch() {
     cd "$functionEntryPWD"
 
 
+
+
+    cd "$currentAccessoriesDir"/parts/
+    _gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_dummy.git
+    cd "$functionEntryPWD"
+
+        cd "$currentAccessoriesDir"/parts/
+    _gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_puddleJumper.git
+    cd "$functionEntryPWD"
+
+
     cd "$functionEntryPWD"
     _stop
 }

diff --git a/_prog/installation_prog.sh b/_prog/installation_prog.sh
@@ -7,6 +7,24 @@ _test_prog() {
 	_wantGetDep unsquashfs
 }
 
+_gitMad_neighbors_procedure() {
+	local functionEntryPWD
+	functionEntryPWD="$PWD"
+
+	[[ ! -e '/cygdrive/c/core/variant/ubdist_dummy' ]] && _messageFAIL
+	cd '/cygdrive/c/core/variant/ubdist_dummy'
+	_gitMad
+
+	[[ ! -e '/cygdrive/c/core/variant/ubdist_puddleJumper' ]] && _messageFAIL
+	cd '/cygdrive/c/core/variant/ubdist_puddleJumper'
+	_gitMad
+
+	cd "$functionEntryPWD"
+}
+_gitMad_neighbors() {
+	"$scriptAbsoluteLocation _gitMad_neighbors "$@""
+}
+
 
 _setup_install() {
 	true
@@ -64,6 +82,8 @@ _setup_install() {
 
 	_messagePlain_probe_cmd _self_gitMad
 
+	_messagePlain_probe_cmd _gitMad_neighbors
+
 	sleep 5
 }
 

diff --git a/ubiquitous_bash.sh b/ubiquitous_bash.sh
@@ -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='2990324807'
+export ub_setScriptChecksum_contents='3950898990'
 
 # CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
 # WARNING: Performance may be crucial here.
@@ -46229,6 +46229,24 @@ _test_prog() {
 	_wantGetDep unsquashfs
 }
 
+_gitMad_neighbors_procedure() {
+	local functionEntryPWD
+	functionEntryPWD="$PWD"
+
+	[[ ! -e '/cygdrive/c/core/variant/ubdist_dummy' ]] && _messageFAIL
+	cd '/cygdrive/c/core/variant/ubdist_dummy'
+	_gitMad
+
+	[[ ! -e '/cygdrive/c/core/variant/ubdist_puddleJumper' ]] && _messageFAIL
+	cd '/cygdrive/c/core/variant/ubdist_puddleJumper'
+	_gitMad
+
+	cd "$functionEntryPWD"
+}
+_gitMad_neighbors() {
+	"$scriptAbsoluteLocation _gitMad_neighbors "$@""
+}
+
 
 _setup_install() {
 	true
@@ -46286,6 +46304,8 @@ _setup_install() {
 
 	_messagePlain_probe_cmd _self_gitMad
 
+	_messagePlain_probe_cmd _gitMad_neighbors
+
 	sleep 5
 }
 
@@ -50069,6 +50089,17 @@ _build_ubDistBuild-fetch() {
     cd "$functionEntryPWD"
 
 
+
+
+    cd "$currentAccessoriesDir"/parts/
+    _gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_dummy.git
+    cd "$functionEntryPWD"
+
+        cd "$currentAccessoriesDir"/parts/
+    _gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_puddleJumper.git
+    cd "$functionEntryPWD"
+
+
     cd "$functionEntryPWD"
     _stop
 }
+25 −0		.github/workflows/zCustom.yml
+23 −0		_lib/nsis/ubDistBuild.nsi
+11 −0		_prog/build-special.sh
+20 −0		_prog/installation_prog.sh
+32 −1		ubiquitous_bash.sh