From 92419a5ed7c0a6e67bb2a6508e9d8c9637210ce9 Mon Sep 17 00:00:00 2001
From: idprism <idprism@yahoo.com>
Date: Thu, 21 Nov 2024 00:58:24 -0800
Subject: [PATCH 1/3] fix various errors caused by new releases

---
 factorio | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/factorio b/factorio
index 3fb7ad3..c13fbd1 100755
--- a/factorio
+++ b/factorio
@@ -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 -oPE 'factorio-headless.+|factorio_headless.+'); then
       debug "Found, latest version: '${filename}'"
     else
       debug "${httpresponse}"
@@ -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(){

From 7d80ee7bd2492c4832951388d075c562fb019a56 Mon Sep 17 00:00:00 2001
From: idprism <idprism@yahoo.com>
Date: Thu, 21 Nov 2024 00:58:24 -0800
Subject: [PATCH 2/3] fix various errors caused by new releases (minus a typo)

---
 factorio | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/factorio b/factorio
index 3fb7ad3..c13fbd1 100755
--- a/factorio
+++ b/factorio
@@ -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 -oPE 'factorio-headless.+|factorio_headless.+'); then
       debug "Found, latest version: '${filename}'"
     else
       debug "${httpresponse}"
@@ -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(){

From 852973b317d8cf32632fc0e6020eb14d9a25d926 Mon Sep 17 00:00:00 2001
From: idprism <idprism@yahoo.com>
Date: Thu, 21 Nov 2024 01:02:51 -0800
Subject: [PATCH 3/3] remove a typo

---
 factorio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/factorio b/factorio
index c13fbd1..ae73783 100755
--- a/factorio
+++ b/factorio
@@ -483,7 +483,7 @@ function install(){
     fi
     
     # parse the response
-    if filename=$(echo "${httpresponse}" |grep -oP '(?<=^location: )[^\?]+' |grep -oPE 'factorio-headless.+|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}"