JHUAPL/DistMaker
1
0
Fork 0
mirror of https://github.com/JHUAPL/DistMaker.git synced 2026-01-08 20:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added logic to enable run script associated with the Linux build to run on other platforms.

Browse Source
This commit is contained in:
Norberto Lopez
2017-07-12 19:32:14 +00:00
parent cdaafece45
commit 2e7abaa4c1
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
script/linuxUtils.py
View File

@@ -119,7 +119,9 @@ def buildBashScript(destFile, args, jreTarGzFile):
jvmArgsStr += aStr + ' '
f = open(destFile, 'wb')
f.write('#!/bin/bash\n')
# f.write('#!/bin/bash\n')
f.write('#!/usr/bin/env bash\n')
f.write('# Do not remove the opening or closing brackets: {}. This enables safe inline\n')
f.write('# mutations to this script while it is running\n')
f.write('{ # Do not remove this bracket! \n\n')
@@ -137,8 +139,18 @@ def buildBashScript(destFile, args, jreTarGzFile):
else:
f.write('maxMem=' + maxMem + '\n\n')
f.write('# Get the instalation path\n')
f.write('installPath=$(readlink -f "$BASH_SOURCE")\n')
f.write('# Get the installation path\n')
f.write('# We support the Apple / Linux variants explicitly and then default back to Linux\n')
f.write('if [ "$(uname -s)" == "Darwin" ]; then\n')
f.write(' # Apple platform: We assume the coreutils package has been installed...\n')
f.write(' installPath=$(greadlink -f "$BASH_SOURCE")\n')
f.write('elif [ "$(uname -s)" == "Linux" ]; then\n')
f.write(' # Linux platform\n')
f.write(' installPath=$(readlink -f "$BASH_SOURCE")\n')
f.write('else\n')
f.write(' # Other platform: ---> Defaults back to Linux platform\n')
f.write(' installPath=$(readlink -f "$BASH_SOURCE")\n')
f.write('fi\n')
f.write('installPath=$(dirname "$installPath")\n\n')
f.write('# Change the working directory to the app folder in the installation path\n')

2
tools/buildRelease
View File

@@ -11,7 +11,7 @@ import time
# Globals
# The default version of DistMaker
version = '0.45'
version = '0.46'
def logAndPrint(message="", indent=0, showTime=False):