diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-09 13:09:47 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-09 13:09:47 -0400 |
| commit | 53e0e8cd2410e63c7725206db4a8156cc460d111 (patch) | |
| tree | fce91f1b31a1beaa0cfb017c76dd766f9496b40d /src/SMAPI.Installer | |
| parent | b4e95a92b33c541d36379d69d3650c5c22ea324c (diff) | |
| parent | 46947683cd7c444d2afc8583198e1f103e905007 (diff) | |
| download | SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.tar.gz SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.tar.bz2 SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI.Installer')
| -rw-r--r-- | src/SMAPI.Installer/assets/install on Linux.sh | 2 | ||||
| -rw-r--r-- | src/SMAPI.Installer/assets/install on Windows.bat | 4 | ||||
| -rw-r--r-- | src/SMAPI.Installer/assets/install on macOS.command | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/SMAPI.Installer/assets/install on Linux.sh b/src/SMAPI.Installer/assets/install on Linux.sh index 3b7eae9c..70b21521 100644 --- a/src/SMAPI.Installer/assets/install on Linux.sh +++ b/src/SMAPI.Installer/assets/install on Linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cd "`dirname "$0"`" internal/linux/SMAPI.Installer diff --git a/src/SMAPI.Installer/assets/install on Windows.bat b/src/SMAPI.Installer/assets/install on Windows.bat index b0d9ae81..c61a801e 100644 --- a/src/SMAPI.Installer/assets/install on Windows.bat +++ b/src/SMAPI.Installer/assets/install on Windows.bat @@ -4,7 +4,9 @@ setlocal enabledelayedexpansion SET installerDir="%~dp0" REM make sure we're not running within a zip folder -echo %installerDir% | findstr /C:"%TEMP%" 1>nul +REM The error level is usually 0 (install dir contains temp path), 1 (it doesn't), or 9009 (findstr doesn't exist due to a Windows issue). +REM If the command doesn't exist, just skip this check. +echo %installerDir% | findstr /C:"%TEMP%" 1>nul 2>null if %ERRORLEVEL% EQU 0 ( echo Oops! It looks like you're running the installer from inside a zip file. Make sure you unzip the download first. echo. diff --git a/src/SMAPI.Installer/assets/install on macOS.command b/src/SMAPI.Installer/assets/install on macOS.command index abd21dc8..e85230ed 100644 --- a/src/SMAPI.Installer/assets/install on macOS.command +++ b/src/SMAPI.Installer/assets/install on macOS.command @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cd "`dirname "$0"`" |