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

simple fixes to errors introduced by release/version forward creep #213

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

simple fixes to errors introduced by release/version forward creep #213

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92419a5
fix various errors caused by new releases
idprism Nov 21, 2024
7d80ee7
fix various errors caused by new releases (minus a typo)
idprism Nov 21, 2024
31c95e7
Merge remote-tracking branch 'refs/remotes/origin/master'
idprism Nov 21, 2024
852973b
remove a typo
idprism Nov 21, 2024
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
6 changes: 3 additions & 3 deletions factorio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ function install(){
fi

# parse the response
if filename=$(echo "${httpresponse}" |grep -oP '(?<=^location: )[^\?]+' |grep -oP 'factorio_headless.+'); then
if filename=$(echo "${httpresponse}" |grep -oP '(?<=^location: )[^\?]+' |grep -oP 'factorio-headless.+|factorio_headless.+'); then
debug "Found, latest version: '${filename}'"
else
debug "${httpresponse}"
Expand Down Expand Up @@ -553,11 +553,11 @@ function install(){
}

function get_bin_version(){
as_user "$BINARY --version |egrep '^Version: [0-9\.]+' |egrep -o '[0-9\.]+' |head -n 1"
as_user "$BINARY --version |grep -E '^Version: [0-9\.]+' |grep -E -o '[0-9\.]+' |head -n 1"
}

function get_bin_arch(){
as_user "$BINARY --version |egrep '^Binary version: ' |egrep -o '[0-9]{2}'"
as_user "$BINARY --version |grep -E '^Version: [0-9\.]+|^Binary' |grep -E -o '[0-9\.]+' |tail -n 1"
}

function update(){
Expand Down