Skip to content

Commit 05f2178

Browse files
tonyofbyteballtonyofbyteball
committed
Merge branch 'tn'
2 parents 2403d94 + 02b1c57 commit 05f2178

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎Gruntfile.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ module.exports = function(grunt) {
160160
options: {timestamp: true, mode: true},
161161
files: [
162162
{expand: true, cwd: './webkitbuilds/', src: ['byteball.desktop', '../public/img/icons/icon-white-outline.ico', '../public/img/icons/icon-white-256.png'], dest: '../byteballbuilds/Byteball test/linux32/', flatten: true, filter: 'isFile', options: {timestamp: true, mode: true} },
163-
{expand: true, cwd: './webkitbuilds/', src: ['byteball.desktop', '../public/img/icons/icon-white-outline.ico', '../public/img/icons/icon-white-256.png'], dest: '../byteballbuilds/Byteball test/linux64/', flatten: true, filter: 'isFile', options: {timestamp: true, mode: true} },
163+
{expand: true, cwd: './webkitbuilds/', src: ['byteball.desktop', '../public/img/icons/icon-white-outline.ico', '../public/img/icons/icon-white-256.png'], dest: '../byteballbuilds/Byteball-TN/linux64/', flatten: true, filter: 'isFile', options: {timestamp: true, mode: true} },
164164
],
165165
}
166166
},
@@ -187,14 +187,14 @@ module.exports = function(grunt) {
187187
//platforms: ['win','osx64','linux'],
188188
//platforms: ['osx64'],
189189
platforms: [getPlatform()],
190-
appName: 'Byteball test',
190+
appName: 'Byteball-TN',
191191
buildDir: '../byteballbuilds',
192192
version: '0.14.7',
193193
zip: false,
194194
macIcns: './public/img/icons/icon-white-outline.icns',
195195
winIco: './public/img/icons/icon-white-outline.ico',
196196
exeIco: './public/img/icons/icon-white-outline.ico',
197-
macPlist: {CFBundleURLTypes: [{CFBundleURLName: 'Byteball action', CFBundleURLSchemes: ['byteball-test']}], /*CFBundleIconFile: 'nw.icns',*/ LSHasLocalizedDisplayName: 0}
197+
macPlist: {CFBundleURLTypes: [{CFBundleURLName: 'Byteball action', CFBundleURLSchemes: ['byteball-tn']}], /*CFBundleIconFile: 'nw.icns',*/ LSHasLocalizedDisplayName: 0}
198198
},
199199
src: ['./package.json', './public/**/*', './angular-bitcore-wallet-client/**/*']
200200
},
@@ -213,7 +213,7 @@ module.exports = function(grunt) {
213213
archive: '../byteballbuilds/byteball-linux64.zip'
214214
},
215215
expand: true,
216-
cwd: '../byteballbuilds/Byteball test/linux64/',
216+
cwd: '../byteballbuilds/Byteball-TN/linux64/',
217217
src: ['**/*'],
218218
dest: 'byteball-linux64/'
219219
}

‎cordova/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if [ ! -d $PROJECT ]; then
9797
cordova plugin add cordova-plugin-statusbar
9898
checkOK
9999

100-
cordova plugin add cordova-plugin-customurlscheme --variable URL_SCHEME=byteball-test
100+
cordova plugin add cordova-plugin-customurlscheme --variable URL_SCHEME=byteball-tn
101101
checkOK
102102

103103
# cordova plugin add cordova-plugin-inappbrowser

‎cordova/config.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="org.byteball.wallet"
2+
<widget id="org.byteball.wallet.testnet"
33
version="0.6.0"
44
android-versionCode="99"
55
ios-CFBundleVersion="0.6.0">
6-
<name>Byteball test</name>
6+
<name>Byteball TN</name>
77
<description>
88
Byteball wallet for testnet.
99
</description>

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "byteball-test",
2+
"name": "byteball-tn",
33
"description": "A wallet for decentralized value",
44
"author": "Byteball",
5-
"version": "0.6.0",
5+
"version": "0.6.0t",
66
"keywords": [
77
"wallet",
88
"byteball",

‎webkitbuilds/build-osx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [ -d "$dir" ]; then
1010
fi
1111

1212
# set up your app name, architecture, and background image file name
13-
APP_NAME="Byteball test"
13+
APP_NAME="Byteball-TN"
1414
ARCH="$1"
1515
DMG_BACKGROUND_IMG="Background.png"
1616

‎webkitbuilds/setup-win32.iss‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppName "Byteball test"
5-
#define MyAppPackageName "Byteball test"
4+
#define MyAppName "Byteball-TN"
5+
#define MyAppPackageName "Byteball-TN"
66
#define MyAppVersion "0.6.0"
77
#define MyAppPublisher "Byteball"
88
#define MyAppURL "https://byteball.org"
9-
#define MyAppExeName "Byteball test.exe"
9+
#define MyAppExeName "Byteball-TN.exe"
1010

1111
[Setup]
1212
; AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c}
@@ -34,13 +34,13 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
3434
; Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
3535

3636
[Registry]
37-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; Flags: uninsdeletekey
38-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; ValueType: string; ValueName: ""; ValueData: "URL:Byteball Protocol"
39-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
40-
Root: HKLM; Subkey: "Software\Classes\byteball-test\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\icon.ico"
41-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell"
42-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell\open"
43-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName} ""%1"""
37+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; Flags: uninsdeletekey
38+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; ValueType: string; ValueName: ""; ValueData: "URL:Byteball Protocol"
39+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
40+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\icon.ico"
41+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell"
42+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell\open"
43+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName} ""%1"""
4444

4545
[Tasks]
4646
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

‎webkitbuilds/setup-win64.iss‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppName "Byteball test"
5-
#define MyAppPackageName "Byteball test"
4+
#define MyAppName "Byteball-TN"
5+
#define MyAppPackageName "Byteball-TN"
66
#define MyAppVersion "0.6.0"
77
#define MyAppPublisher "Byteball"
88
#define MyAppURL "https://byteball.org"
9-
#define MyAppExeName "Byteball test.exe"
9+
#define MyAppExeName "Byteball-TN.exe"
1010

1111
[Setup]
1212
; AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c}
@@ -34,13 +34,13 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
3434
; Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
3535

3636
[Registry]
37-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; Flags: uninsdeletekey
38-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; ValueType: string; ValueName: ""; ValueData: "URL:Byteball Protocol"
39-
Root: HKLM; Subkey: "Software\Classes\byteball-test"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
40-
Root: HKLM; Subkey: "Software\Classes\byteball-test\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\icon.ico"
41-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell"
42-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell\open"
43-
Root: HKLM; Subkey: "Software\Classes\byteball-test\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName} ""%1"""
37+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; Flags: uninsdeletekey
38+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; ValueType: string; ValueName: ""; ValueData: "URL:Byteball Protocol"
39+
Root: HKLM; Subkey: "Software\Classes\byteball-tn"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
40+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\icon.ico"
41+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell"
42+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell\open"
43+
Root: HKLM; Subkey: "Software\Classes\byteball-tn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName} ""%1"""
4444

4545
[Tasks]
4646
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

0 commit comments

Comments
 (0)