You've already forked OpenRCT2-Unity
mirror of
https://github.com/izzy2lost/OpenRCT2-Unity.git
synced 2026-03-10 12:38:22 -07:00
Script improvements (#14452)
shebang: Move parameters from set. Add newline after for consistency. curl: Add -f; Prevents output on error. Use -O where applicable; -o with the same filename as the URL is pointless. Add -S after -s: Makes curl still error despite being silent. build-symbols: Add zip fallback. get-discord-rpc: Move git clone parameters before repository for readability. Use --depth 1 to speed up cloning. install-nsis: Use ProgramData environment variable. build-appimage-docker.sh: Add -e to docker run. Run script directly. build-appimage.sh: Make if more consistent. Remove unused Travis scripts. setenv: unset instead of blanking variables. vstool.cmd: Use ProgramFiles(x86) environment variable.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
#!/bin/bash -e
|
||||
|
||||
if [[ "$#" -ne 0 && "$#" -ne 2 ]]; then
|
||||
echo 'Install a portable version of NSIS which can build the OpenRCT2 Windows installer.'
|
||||
echo ''
|
||||
@@ -11,7 +11,7 @@ fi
|
||||
|
||||
if [[ "$1" == "-d" ]]; then
|
||||
echo -e "\033[0;36mDownloading prebuilt NSIS from GitHub...\033[0m"
|
||||
curl -sLo nsis.zip "https://github.com/OpenRCT2/Dependencies/releases/download/v20/nsis.zip"
|
||||
curl -sSfLO "https://github.com/OpenRCT2/Dependencies/releases/download/v20/nsis.zip"
|
||||
7z -bd -y "-o$2" x nsis.zip
|
||||
rm nsis.zip
|
||||
echo -e "\033[0;32mNSIS downloaded, add "$2/bin" to PATH\033[0m"
|
||||
@@ -19,7 +19,7 @@ if [[ "$1" == "-d" ]]; then
|
||||
fi
|
||||
|
||||
# Download NSIS with chocolatey and then download extra plugins
|
||||
nsisdir="C:/ProgramData/chocolatey/lib/nsis.portable"
|
||||
nsisdir="$ProgramData/chocolatey/lib/nsis.portable"
|
||||
if [[ -d $nsisdir ]]
|
||||
then
|
||||
echo -e "\033[0;36mNSIS already installed.\033[0m"
|
||||
@@ -30,13 +30,13 @@ echo -e "\033[0;36mDownloading NSIS from chocolatey...\033[0m"
|
||||
cinst nsis.portable --version=3.01-beta1
|
||||
|
||||
echo -e "\033[0;36mDownloading KillProcDLL for NSIS...\033[0m"
|
||||
curl -sLo nsisxtra.zip "http://nsis.sourceforge.net/mediawiki/images/5/53/KillProcDll%26FindProcDll.zip"
|
||||
curl -sSfLo nsisxtra.zip "http://nsis.sourceforge.net/mediawiki/images/5/53/KillProcDll%26FindProcDll.zip"
|
||||
7z x nsisxtra.zip
|
||||
cp FindProcDLL.dll "$nsisdir/tools/nsis-3.0b1/Plugins/x86-ansi"
|
||||
|
||||
echo -e "\033[0;36mDownloading UAC plugin for NSIS...\033[0m"
|
||||
curl -sLo uac.zip "http://nsis.sourceforge.net/mediawiki/images/8/8f/UAC.zip"
|
||||
7z x uac.zip
|
||||
curl -sSfLO "http://nsis.sourceforge.net/mediawiki/images/8/8f/UAC.zip"
|
||||
7z x UAC.zip
|
||||
cp UAC.nsh "$nsisdir/tools/nsis-3.0b1/Include"
|
||||
cp -r Plugins "$nsisdir/tools/nsis-3.0b1"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user