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.

Sign up for GitHub

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

vNext #438

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

vNext #438

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f53d8f9
Sync master back into development (#430)
yubiuser Feb 24, 2025
6ea709a
Sync master back into development (#433)
yubiuser Feb 25, 2025
2f7ebaa
Fix resize during startup
yubiuser Feb 27, 2025
2cb9bd3
Fix resize during startup (#437)
yubiuser Feb 27, 2025
cde0ac7
Fix typo: replace "remmote" with "remote"
rdwebdesign Feb 28, 2025
66993ab
Fix typo: replace "remmote" with "remote" (#439)
yubiuser Feb 28, 2025
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
9 changes: 6 additions & 3 deletions padd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ GetVersionInformation() {
# Gather core version information...
CORE_BRANCH="$(GetPADDValue version.core.local.branch)"
CORE_VERSION="$(GetPADDValue version.core.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_CORE_VERSION="$(GetPADDValue version.core.remmote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_CORE_VERSION="$(GetPADDValue version.core.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
CORE_HASH="$(GetPADDValue version.core.local.hash)"
GITHUB_CORE_HASH="$(GetPADDValue version.core.remote.hash)"

Expand Down Expand Up @@ -780,7 +780,7 @@ GetVersionInformation() {
if [ ! "$WEB_VERSION" = "null" ]; then
WEB_BRANCH="$(GetPADDValue version.web.local.branch)"
WEB_VERSION="$(GetPADDValue version.web.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_WEB_VERSION="$(GetPADDValue version.web.remmote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_WEB_VERSION="$(GetPADDValue version.web.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
WEB_HASH="$(GetPADDValue version.web.local.hash)"
GITHUB_WEB_HASH="$(GetPADDValue version.web.remote.hash)"

Expand Down Expand Up @@ -824,7 +824,7 @@ GetVersionInformation() {
# Gather FTL version information...
FTL_BRANCH="$(GetPADDValue version.ftl.local.branch)"
FTL_VERSION="$(GetPADDValue version.ftl.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_FTL_VERSION="$(GetPADDValue version.ftl.remmote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
GITHUB_FTL_VERSION="$(GetPADDValue version.ftl.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
FTL_HASH="$(GetPADDValue version.ftl.local.hash)"
GITHUB_FTL_HASH="$(GetPADDValue version.ftl.remote.hash)"

Expand Down Expand Up @@ -1887,6 +1887,9 @@ main(){

StartupRoutine ${padd_size}

# Run SizeChecker again to account for resizing during startup
SizeChecker

# Run PADD
NormalPADD
}
Expand Down