Skip to content

Commit 26eb517

Browse files
author
Developer
committed
Fixed Parallax name error in Windows' .iss file. Fixed Ubuntu-incompatible code in set_version script.
1 parent d351215 commit 26eb517

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

package/blocklypropclient-installer.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define MyAppName "BlocklyPropClient"
55
#define MyAppVersion "0.5.3"
6-
#define MyAppPublisher "Parallax, Inc."
6+
#define MyAppPublisher "Parallax Inc."
77
#define MyAppURL "http://blockly.parallax.com/"
88
#define MyAppExeName "BlocklyPropClient.exe"
99

set_version

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
#
55
# Usage: $ ./set_version "1.2.3"
66

7+
78
#
89
# Error if no version string declared
910
#
10-
if [ $1X == X ]
11+
if [ -z "$1" ]
12+
#if [ $1X == X ] <-- this doesn't work in Ubuntu
1113
then
1214
echo "ERROR: Must specify a version number. Ex: \$ $0 \"1.2.3\""
1315
exit 1
@@ -30,7 +32,8 @@ VERSION=$1
3032
# grep and sed, must use an expanded pattern for text where each letter is expressed in both upper/lower case.
3133
# ex: Ver should be [vV][eE][rR]
3234
#
33-
function FindAndSetVersion {
35+
FindAndSetVersion() {
36+
#function FindAndSetVersion { <-- this doesn't work in Ubuntu
3437
if grep -q -E ${VERSIONPATTERN} ${VERSIONFILE} ; then
3538
if sed -i.bak -E "s/${VERSIONPATTERN}/${VERSIONSTRING}/" ${VERSIONFILE} ; then
3639
echo "Updated file \"${VERSIONFILE}\" to include: ${VERSIONSTRING}"
@@ -40,6 +43,7 @@ else
4043
fi
4144
}
4245

46+
4347
#
4448
# Adjust BlocklyPropClient.py file
4549
#

0 commit comments

Comments
 (0)