Skip to content

Commit 29a2902

Browse files
mirage335mirage335
committed
Correction.
1 parent 31ab1ba commit 29a2902

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎_prog-ops/get-custom.sh‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ _get_vmImg_ubDistBuild_sequence() {
5959
local currentExitStatus
6060
if [[ "$3" == "" ]] # || [[ "$FORCE_AXEL" != "" ]]
6161
then
62-
_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar xv --overwrite
62+
_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar xv --overwrite
6363
currentExitStatus="$?"
6464
else
65-
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar --extract vm.img --to-stdout | _dd of="$3" bs=1M
66-
_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar --extract ./vm.img --to-stdout | sudo -n dd of="$3" bs=1M status=progress
65+
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar --extract vm.img --to-stdout | _dd of="$3" bs=1M
66+
_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "package_image.tar.flx" | _get_extract_ubDistBuild-tar --extract ./vm.img --to-stdout | sudo -n dd of="$3" bs=1M status=progress
6767
currentExitStatus="$?"
6868
fi
6969
if [[ "$currentExitStatus" != "0" ]]
@@ -103,8 +103,8 @@ _get_vmImg_ubDistBuild_sequence() {
103103
fi
104104
if [[ "$currentHash" == "" ]] || [[ "$currentHash_bytes" == "" ]]
105105
then
106-
currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 3 | tail -n 1)
107-
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 2 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
106+
currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 3 | tail -n 1)
107+
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 2 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
108108
fi
109109
( [[ "$currentHash" == "" ]] || [[ "$currentHash_bytes" == "" ]] ) && _messageFAIL
110110
export MANDATORY_HASH=
@@ -160,10 +160,10 @@ _get_vmImg_ubDistBuild-live_sequence() {
160160
export MANDATORY_HASH="true"
161161
if [[ "$3" == "" ]] # || [[ "$FORCE_AXEL" != "" ]]
162162
then
163-
_wget_githubRelease_join "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso"
163+
_wget_githubRelease_join "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso"
164164
currentExitStatus="$?"
165165
else
166-
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 14 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
166+
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 14 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
167167

168168
if ! [[ $(df --block-size=1000000 --output=avail "$tmpSelf" | tr -dc '0-9') -gt "3880" ]]
169169
then
@@ -183,33 +183,33 @@ _get_vmImg_ubDistBuild-live_sequence() {
183183
#sudo -n dvd+rw-format -ssa=256m "$3"
184184
#sudo -n dvd+rw-format -ssa=none "$3"
185185

186-
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso" | sudo -n wodim -v -sao dev="$3" tsize="$currentHash_bytes" -waiti -
186+
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso" | sudo -n wodim -v -sao dev="$3" tsize="$currentHash_bytes" -waiti -
187187
#-speed=256
188188
#-dvd-compat
189189
#-overburn
190190
#-use-the-force-luke=bufsize:2560m
191191
#pv -pterbTCB 1G
192-
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso" | sudo -n growisofs -speed=256 -dvd-compat -Z "$3"=/dev/stdin -use-the-force-luke=notray
192+
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso" | sudo -n growisofs -speed=256 -dvd-compat -Z "$3"=/dev/stdin -use-the-force-luke=notray
193193

194194

195195

196196

197197

198-
( _wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso" | tee >(openssl dgst -whirlpool -binary | xxd -p -c 256 >> "$scriptLocal"/hash-download.txt) ; dd if=/dev/zero bs=2048 count=$(bc <<< '1000000000000 / 2048' ) ) | sudo -n growisofs -speed=2 -dvd-compat -Z "$3"=/dev/stdin -use-the-force-luke=notray -use-the-force-luke=spare:min -use-the-force-luke=bufsize:128m
198+
( _wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso" | tee >(openssl dgst -whirlpool -binary | xxd -p -c 256 >> "$scriptLocal"/hash-download.txt) ; dd if=/dev/zero bs=2048 count=$(bc <<< '1000000000000 / 2048' ) ) | sudo -n growisofs -speed=2 -dvd-compat -Z "$3"=/dev/stdin -use-the-force-luke=notray -use-the-force-luke=spare:min -use-the-force-luke=bufsize:128m
199199
currentExitStatus="$?"
200200

201201

202202

203203
# May be untested.
204204
# Theoretically, wodim may be usable with Cygwin/MSW . Unfortunately, defect management may not be available. In any case, 'growisofs' is definitely preferable whenever possible.
205-
#( _wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso" | tee >(openssl dgst -whirlpool -binary | xxd -p -c 256 >> "$scriptLocal"/hash-download.txt) ; dd if=/dev/zero bs=2048 count=$(bc <<< '0 / 2048' ) ) | sudo -n wodim -v -sao fs=128m dev="$3" blank=session tsize="$currentHash_bytes" /dev/stdin
205+
#( _wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso" | tee >(openssl dgst -whirlpool -binary | xxd -p -c 256 >> "$scriptLocal"/hash-download.txt) ; dd if=/dev/zero bs=2048 count=$(bc <<< '0 / 2048' ) ) | sudo -n wodim -v -sao fs=128m dev="$3" blank=session tsize="$currentHash_bytes" /dev/stdin
206206
#currentExitStatus="$?"
207207

208208

209209

210210

211211

212-
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "vm-live.iso" | cat > /dev/null
212+
#_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "vm-live.iso" | cat > /dev/null
213213
#currentExitStatus="$?"
214214

215215

@@ -239,8 +239,8 @@ _get_vmImg_ubDistBuild-live_sequence() {
239239
fi
240240
if [[ "$currentHash" == "" ]] || [[ "$currentHash_bytes" == "" ]]
241241
then
242-
currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 15 | tail -n 1)
243-
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 14 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
242+
currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 15 | tail -n 1)
243+
currentHash_bytes=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 14 | tail -n 1 | sed 's/^.*count=$(bc <<< '"'"'//' | cut -f1 -d\ )
244244
fi
245245
( [[ "$currentHash" == "" ]] || [[ "$currentHash_bytes" == "" ]] ) && _messageFAIL
246246
export MANDATORY_HASH=
@@ -291,7 +291,7 @@ _get_vmImg_ubDistBuild-rootfs_sequence() {
291291
mkdir -p "$scriptLocal"
292292
cd "$scriptLocal"
293293
export MANDATORY_HASH="true"
294-
_wget_githubRelease_join-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "package_rootfs.tar.flx" | lz4 -d -c > ./package_rootfs.tar
294+
_wget_githubRelease_join-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "package_rootfs.tar.flx" | lz4 -d -c > ./package_rootfs.tar
295295
[[ "$?" != "0" ]] && _messageFAIL
296296
export MANDATORY_HASH=
297297
unset MANDATORY_HASH
@@ -307,7 +307,7 @@ _get_vmImg_ubDistBuild-rootfs_sequence() {
307307
export MANDATORY_HASH=
308308
unset MANDATORY_HASH
309309
[[ "$2" != "" ]] && currentHash="$2"
310-
[[ "$2" == "" ]] && currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist-dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 9 | tail -n 1)
310+
[[ "$2" == "" ]] && currentHash=$(_wget_githubRelease-stdout "soaringDistributions/ubdist_dummy" "$releaseLabel" "_hash-ubdist.txt" | head -n 9 | tail -n 1)
311311
export MANDATORY_HASH=
312312
unset MANDATORY_HASH
313313

0 commit comments

Comments
 (0)