Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Tiny11 #240

Merged
merged 7 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM scratch
COPY --from=qemux/qemu-arm:2.23 / /
COPY --from=qemux/qemu-arm:2.24 / /

ARG VERSION_ARG="0.00"
ARG DEBCONF_NOWARNINGS="yes"
Expand Down
63 changes: 55 additions & 8 deletions src/define.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -Eeuo pipefail
: "${USERNAME:=""}"
: "${PASSWORD:=""}"

MIRRORS=1
MIRRORS=2
PLATFORM="ARM64"

parseVersion() {
Expand Down Expand Up @@ -95,11 +95,13 @@ parseVersion() {
"2003" | "2003r2" | "win2003" | "win2003r2" | "windows2003" | "windows 2003" )
error "Windows Server 2003 $msg" && return 1
;;
"core11" | "core 11" )
error "Tiny 11 Core $msg" && return 1
;;
"tiny11" | "tiny 11" )
error "Tiny 11 $msg" && return 1
VERSION="tiny11"
[ -z "$DETECTED" ] && DETECTED="win11arm64"
;;
"core11" | "core 11" )
VERSION="core11"
[ -z "$DETECTED" ] && DETECTED="win11arm64"
;;
"tiny10" | "tiny 10" )
error "Tiny 10 $msg" && return 1
Expand Down Expand Up @@ -386,6 +388,8 @@ printVersion() {
local desc="$2"

case "${id,,}" in
"tiny11"* ) desc="Tiny 11" ;;
"core11"* ) desc="Core 11" ;;
"win10"* ) desc="Windows 10" ;;
"win11"* ) desc="Windows 11" ;;
esac
Expand Down Expand Up @@ -439,8 +443,11 @@ fromFile() {
local desc="$1"
local file="${1,,}"
local arch="${PLATFORM,,}"

case "${file// /_}" in

file="${file//-/_}"
file="${file// /_}"

case "$file" in
*"_x64_"* | *"_x64."*)
arch="x64"
;;
Expand All @@ -452,7 +459,13 @@ fromFile() {
;;
esac

case "${file// /_}" in
case "$file" in
"tiny11core"* | "tiny11_core"* | "tiny_11_core"* )
id="core11"
;;
"tiny11"* | "tiny_11"* )
id="tiny11"
;;
"win10"*| "win_10"* | *"windows10"* | *"windows_10"* )
id="win10${arch}"
;;
Expand Down Expand Up @@ -600,6 +613,40 @@ getLink1() {
return 0
}

getLink2() {

local id="$1"
local lang="$2"
local ret="$3"
local url=""
local sum=""
local size=""
local host="https://archive.org/download"

[[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

case "${id,,}" in
"tiny11" )
size=4480499712
sum="ec6056aa554c17290224af23e1b99961fe99606bb5ea9102d61838939c63325b"
url="tiny11a64/tiny11a64%20r1.iso"
;;
"core11" )
size=3300327424
sum="812dae6b5bf5215db63b61ae10d8f0ffd3aa8529a18d96e9ced53341e2c676ec"
url="tiny11-core-arm64/tiny11%20core%20arm64.iso"
;;
esac

case "${ret,,}" in
"sum" ) echo "$sum" ;;
"size" ) echo "$size" ;;
*) [ -n "$url" ] && echo "$host/$url";;
esac

return 0
}

getValue() {

local val=""
Expand Down
5 changes: 3 additions & 2 deletions src/mido.sh
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ getMG() {
pattern="10_iot_enterprise_ltsc"
;;
esac

fi

local body=""
Expand All @@ -620,10 +620,11 @@ getMG() {
}

local list=""
list=$(echo "$body" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i '\.iso$')
list=$(echo "$body" | xmllint --html --nonet --xpath "//a[contains(text(), '.iso')]" - 2>/dev/null)

local result=""
result=$(echo "$list" | grep -i "${platform}" | grep "${pattern}" | grep -i -m 1 "${locale,,}_")
result=$(echo "$result" | sed -r 's/.*href="([^"]+).*/\1/g')

if [ -z "$result" ]; then
if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then
Expand Down
Loading