Skip to content

Fix bashisms, download using HTTPS #5

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

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

Fix bashisms, download using HTTPS #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
935ea00
Fix bashisms, download using HTTPS
juliogonzalez Apr 20, 2025
9706666
Remove one more bashism from sc3u-patcher.sh
juliogonzalez Apr 20, 2025
2d7f523
Remove bashism from sc3u-2.0a-x86.run.patch
juliogonzalez Apr 20, 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
4 changes: 2 additions & 2 deletions sc3u-2.0a-x86.run.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
+skip=180
# This script was generated using Makeself 1.5.4
-CRCsum=2069455402
+CRCsum=1151330528
+CRCsum=838330230
MD5=00000000000000000000000000000000
label="SimCity 3000 Unlimited 2.0a Update"
-script=./update.sh
+if [ `uname -m` == "x86_64" ]; then
+if test `uname -m` = 'x86_64'; then
+ script="linux32 ./update.sh"
+else
+ script=./update.sh
Expand Down
10 changes: 5 additions & 5 deletions sc3u-patcher.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ SC3U_PATH='/usr/local/games/SC3U'
# Check for required programs
RPROGRAMS="curl cat patch tar"
for RPROGRAM in ${RPROGRAMS}; do
if [ "$(which ${RPROGRAM} &> /dev/null; echo ${?})" != "0" ]; then
if test `which ${RPROGRAM}` = ''; then
echo "ERROR: Required binary ${RPROGRAM} not found. Install it to proceed"
exit 1
fi
done

# Download sc3u patch
if [ ! -f ${PATCH_FNAME} ]; then
curl http://updates.lokigames.com/sc3u/${PATCH_FNAME} -o ${PATCH_FNAME}
if test ! -f ${PATCH_FNAME}; then
curl -L https://updates.lokigames.com/sc3u/${PATCH_FNAME} -o ${PATCH_FNAME}
fi

# Fix compatibility problems
Expand All @@ -37,8 +37,8 @@ sudo cp sc3u ${SC3U_PATH}/sc3u
sudo chmod +x ${SC3U_PATH}/sc3u

# Download and install loki compat libary
if [ ! -f ${LOKI_COMPAT} ]; then
curl http://www.improbability.net/loki/${LOKI_COMPAT} -o ${LOKI_COMPAT}
if test ! -f ${LOKI_COMPAT}; then
curl -L https://www.improbability.net/loki/${LOKI_COMPAT} -o ${LOKI_COMPAT}
fi
sudo tar -xjf ${LOKI_COMPAT} -C ${SC3U_PATH}

Expand Down