From 2ac2fbdf8997a77c2cf7f4b40b690abab332f9b1 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Tue, 16 Jan 2018 20:30:28 +0300
Subject: [PATCH] add ethkey & parity-evm todarwin pkg

+new ststus icons
mac/Parity Ethereum.xcodeproj/project.pbxproj
mac/Parity/AppDelegate.swift
mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png
mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png
mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png
mac/Parity/GetBSDProcessList.swift
mac/install-readme.txt
mac/uninstall-parity.sh
scripts/gitlab-build.sh
---
 mac/Parity Ethereum.xcodeproj/project.pbxproj |  12 ++++-
 mac/Parity/AppDelegate.swift                  |  43 +++++++++---------
 .../statusIcon.imageset/Parity-1.png          | Bin 372 -> 679 bytes
 .../statusIcon.imageset/Parity-2.png          | Bin 1326 -> 3670 bytes
 .../statusIcon.imageset/Parity.png            | Bin 707 -> 1742 bytes
 mac/Parity/GetBSDProcessList.swift            |  12 ++---
 mac/install-readme.txt                        |   4 +-
 mac/uninstall-parity.sh                       |   3 +-
 scripts/gitlab-build.sh                       |   2 +
 9 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/mac/Parity Ethereum.xcodeproj/project.pbxproj b/mac/Parity Ethereum.xcodeproj/project.pbxproj
index 913feec70..2e41be637 100644
--- a/mac/Parity Ethereum.xcodeproj/project.pbxproj	
+++ b/mac/Parity Ethereum.xcodeproj/project.pbxproj	
@@ -13,6 +13,8 @@
 		0ACF9AC71E30FAB600D5C935 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0ACF9AC51E30FAB600D5C935 /* MainMenu.xib */; };
 		0AE564F11E3CE42C00BD01F7 /* GetBSDProcessList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */; };
 		0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0AED4D9F1E3E22F800BF87C0 /* ethstore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B2200E559900AD6E78 /* parity-evm */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B5200E56AE00AD6E78 /* ethkey */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -22,6 +24,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */,
+				84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */,
 				0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */,
 				0A7A475D1E3D2CDD0093D1AB /* parity in CopyFiles */,
 			);
@@ -38,6 +42,8 @@
 		0ACF9AC81E30FAB600D5C935 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetBSDProcessList.swift; sourceTree = "<group>"; };
 		0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../target/release/ethstore; sourceTree = "<group>"; };
+		84CF92B2200E559900AD6E78 /* parity-evm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "parity-evm"; path = "../target/release/parity-evm"; sourceTree = "<group>"; };
+		84CF92B5200E56AE00AD6E78 /* ethkey */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethkey; path = ../target/release/ethkey; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,6 +60,8 @@
 		0ACF9AB51E30FAB600D5C935 = {
 			isa = PBXGroup;
 			children = (
+				84CF92B5200E56AE00AD6E78 /* ethkey */,
+				84CF92B2200E559900AD6E78 /* parity-evm */,
 				0AED4D9F1E3E22F800BF87C0 /* ethstore */,
 				0A7A475C1E3D2CDD0093D1AB /* parity */,
 				0ACF9AC01E30FAB600D5C935 /* Parity Ethereum */,
@@ -110,7 +118,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Parity Technologies";
 				TargetAttributes = {
 					0ACF9ABD1E30FAB600D5C935 = {
@@ -192,6 +200,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -241,6 +250,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/mac/Parity/AppDelegate.swift b/mac/Parity/AppDelegate.swift
index c017e79bd..d65c1d601 100644
--- a/mac/Parity/AppDelegate.swift
+++ b/mac/Parity/AppDelegate.swift
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -22,12 +22,12 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 	@IBOutlet weak var statusMenu: NSMenu!
 	@IBOutlet weak var startAtLogonMenuItem: NSMenuItem!
-	
+
 	let statusItem = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength)
 	var parityPid: Int32? = nil
 	var commandLine: [String] = []
 	let defaultDefaults = "{\"fat_db\":false,\"mode\":\"passive\",\"mode.alarm\":3600,\"mode.timeout\":300,\"pruning\":\"fast\",\"tracing\":false}"
-	
+
 	func menuAppPath() -> String {
 		return Bundle.main.executablePath!
 	}
@@ -40,20 +40,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		return NSRunningApplication.runningApplications(withBundleIdentifier: Bundle.main.bundleIdentifier!).count > 1
 
 	}
-	
+
 	func isParityRunning() -> Bool {
 		if let pid = self.parityPid {
 			return kill(pid, 0) == 0
 		}
 		return false
 	}
-	
+
 	func killParity() {
 		if let pid = self.parityPid {
 			kill(pid, SIGKILL)
 		}
 	}
-	
+
 	func openUI() {
 		let parity = Process()
 		parity.launchPath = self.parityPath()
@@ -61,29 +61,29 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		parity.arguments!.append("ui")
 		parity.launch()
 	}
-	
+
 	func writeConfigFiles() {
 		let basePath = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first?
 			.appendingPathComponent(Bundle.main.bundleIdentifier!, isDirectory: true)
-		
+
 		if FileManager.default.fileExists(atPath: basePath!.path) {
 			return
 		}
-		
+
 		do {
 			let defaultsFileDir = basePath?.appendingPathComponent("chains").appendingPathComponent("ethereum")
 			let defaultsFile = defaultsFileDir?.appendingPathComponent("user_defaults")
-			
+
 			try FileManager.default.createDirectory(atPath: (defaultsFileDir?.path)!, withIntermediateDirectories: true, attributes: nil)
 			if !FileManager.default.fileExists(atPath: defaultsFile!.path) {
 				try defaultDefaults.write(to: defaultsFile!, atomically: false, encoding: String.Encoding.utf8)
 			}
-		
+
 			let configFile = basePath?.appendingPathComponent("config.toml")
 		}
 		catch {}
 	}
-	
+
 	func autostartEnabled() -> Bool {
 		return itemReferencesInLoginItems().existingReference != nil
 	}
@@ -123,7 +123,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		}
 		return (nil, nil)
 	}
-	
+
 	func toggleLaunchAtStartup() {
 		let itemReferences = itemReferencesInLoginItems()
 		let shouldBeToggled = (itemReferences.existingReference == nil)
@@ -155,7 +155,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 	func launchParity() {
 		self.commandLine = CommandLine.arguments.dropFirst().filter({ $0 != "ui"})
-		
+
 		let processes = GetBSDProcessList()!
 		let parityProcess = processes.index(where: {
 			var name = $0.kp_proc.p_comm
@@ -166,7 +166,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 			}
 			return str == "parity"
 		})
-		
+
 		if parityProcess == nil {
 			let parity = Process()
 			let p = self.parityPath()
@@ -178,7 +178,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 			self.parityPid = processes[parityProcess!].kp_proc.p_pid
 		}
 	}
-	
+
 	func applicationDidFinishLaunching(_ aNotification: Notification) {
 		if self.isAlreadyRunning() {
 			openUI()
@@ -188,12 +188,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 		self.writeConfigFiles()
 		self.launchParity()
-		Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true, block: {_ in 
+		Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true, block: {_ in
 			if !self.isParityRunning() {
 				NSApplication.shared().terminate(self)
 			}
 		})
-		
+
 		let icon = NSImage(named: "statusIcon")
 		icon?.isTemplate = true // best for dark mode
 		statusItem.image = icon
@@ -206,19 +206,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		}
 		return true
 	}
-	
+
 	@IBAction func quitClicked(_ sender: NSMenuItem) {
 		self.killParity()
 		NSApplication.shared().terminate(self)
 	}
-	
+
 	@IBAction func openClicked(_ sender: NSMenuItem) {
 		self.openUI()
 	}
-	
+
 	@IBAction func startAtLogonClicked(_ sender: NSMenuItem) {
 		self.toggleLaunchAtStartup()
 	}
 
 }
-
diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png
index 040d444e2bfc2dc39b2715cf187226f0dd324249..75767ebd7d6fe6b52b9edc86cd76c7528a3b3ee8 100644
GIT binary patch
delta 609
zcmV-n0-pW!0;dI#QGenA5Dhyv0r7|Q0006sNkl<ZILnRH--}gM6bJCnow-gDqn?h+
z2!ZF&Aqq+m(P$|2VJtBrf_kY3|2XL(l%TMplqe(nA!a`4L*{PwwoGW$nF)Vo&b>X%
zni%Xlv|w@A=WxDjt?&ANH)}-Kv@6f4u4(tKe)n*Utp$K}U4PTgU^6auO?x<%tegBV
z*!U=*`NaiY)7F?yC4XL5)ggV~8Ms$h)#fypZ#?`@Z$u}3yoD2Z0auZ60H5F$oTPUr
zmDxv*_9AxTICi9xKg9;LI32*p@!V>Ve>>`$b{l4J47;#|U$GxYu^WHj7GA;!m`Wx8
z-ZhO>ieA^WuYckP+{MAD_&ToPHlD;}<W2mE`#8h!ekx@M<8@VC#oM@mC-4l`V>_DY
zdLD~-9CduZMsHA8)nI;cVYtH4yV!%T@E5+v`N$80qn|OrC47WwY{S;o98E>F9m^Z>
zJnlq3JK(diWuATs@}I&N*ta~Qr4^ttJQh5>jET_Lb${H85&Kc>Mi4*1S-gWI;~~J|
z)@tL@Q11aYVi?lc66fo&#W}3QZ?S|FqfU>((@o=2xiSnZoI{6ia2Z$db!hBz6xo1}
z@dhSR$tQXve6}a#uopiC_@-3y=`ilO*z80q`P-3R>)KYV`cQ0eCP3HMRkaI0hSt7B
znO|HOZCa6(vsCh3T*UT1@8iu>@&!DARPuZJ<A0};*LHt5*-CTyW?faU4VFn=sH<ux
vPNkA>cTFqJ&iY@m>O$KW8hhl0wi5pUm<GT%NB2R(00000NkvXXu0mjfkiRoJ

delta 300
zcmV+{0n`4c1@r=tQGek96b=+MfmF4F00032Nkl<ZILqzS&nkpr6bA6$XE4lyp(e_X
zh=sC|?KBtQ3e>EWlnYQwS+G&cC0Jl*V`pPSSfFI(8jx({|K_MMneWqVIra9|Ip=xK
zpXcr6-|DOvxn_XfsA3-P_=t0X@!yiP;s(<J-b7dUSMY|xEPs*~9HW9eEQEg&+nB>F
zwz7!IQMHPlAL6TVpQn+u;~pj4#yIshiUfyA3eg6xVwtDdZID;MdfIOGL*liJ@eeT8
zD7c3S%wVWSy#jjBAO0l_i;6kq@fv_-T;l`-I6_;*p7DYwJmMj8CFqMqj$kT4i_y_#
yO_#-Zm>uX0%q3Zne%nbgl=>1NO^D<VeFvY3x+(Dc*>2hZ0000<MNUMnLSTYcg_CUn

diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png
index 3a4d72b2961cb6c63928deaee31df6bbe3c01433..6a1106f5f1a9e3d7c94c74cd194513ff1a5813d9 100644
GIT binary patch
delta 3624
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

delta 1261
zcmV<J1QPq!9IgtGQGek96b=>{fx5fm000ELNkl<ZXx{CaduUd57{@=(cQ>cyHd{_3
zv&gh5WmjyOWkyC<Dry#G6eWg4P!>XjlvG3-T_{bE#DZYa9jb*Ec9B{a=|Z8)Ty2)R
zj550{x6>bfUifj^UYGBC=7jTwmv`@T&Ut>n=RD8v`&<SoQh%gKks?Kk6#a!k1AKpj
zfim~m1^js+8dePa0}KI<2gU%SfZ-b032Xyefp3A08ap5js{-nP4DgM=uLUj#j_l=`
z-N1XmE5NHj%Rn-$95@fS1c-np;BR0qF#Uh%Sq(f4ys5$a6-NMzHDnzy6_^OD*U0#1
z7q9{N8tCZZdVec0$FsQKa18LG8+sc!8W;&Q_pssbfTh57zzpClU>2|tSmSxj-n#?1
z2`JegMjZ~k?nXWZCMbVCX3$Q<>m1J>eh&_GjRWR;zOv8#2+Ztnqso9rH?SS3SAJW}
zsLgsM8&*?+Rlpm1`T<}{p!Zzhli>Mx4fTG*{ZexTTz{=>67X}dsqcZaV>xUBa0l>K
zaNn1}JfPJ3&H%m$uHR|ONE{cLe<DevSb0;hncro}Tw&ZG%}2m*GH4dp7>W__LlEYP
z=BW=|a6K?u`Bi}jBjDyf>YE5W=QE!Hrv%rY4)o1V+OQ>743W%+A+#~r#LB>neZg4Z
zC7-=Dkbj>KY*PMAl17~_Wk<lHLEJ9@x|MGL4%r9Y(+#<&0=>n+JL+vo(y*6Zq+NQ(
zx^Ii}ZjIkpEHx}g1hQ4??#v`))a-zk@78n3a5aJa{XEwA9H@<zQXPhVB8hrv5E5$w
z!l(+E>tmoI&vh;aE{Mq<my~`=!mtI>cVzVt=6|v*kxVX7B{M1}dqMq;g*NJ_fZmts
zrL4Ewl`jfPrF@&@usf+Xv?CLEL9tlHzW^r&^855w3vh5k=lU|B&932uLMpBgN}KsX
zy;o&x5lPcU2^sdRYb=p{3x*XcZU)8&@<kr#Wj2^eph3cD1CA@C;!6XsGz9YDQhi6j
zj(<t?c<WsIib5(L7W7mr%`I6hG!b7}Ai{{_FyJ-UzNOIlYp(74R{N*00Nx}8CqWpK
z&6m4?8)J=V-Z&Om>l?d0=9PP;__`d=mzdBq{+-LKMH14XdZ!)uAXecQ1SJ-?k)yD&
z!L^Z6`@BAcN3Bigna&d{4DW+HqgCoV6@R$Pj`<@eT$vv7S>EHfIlv<hQfAxbhWV`4
zwqjckYev2390QzeJz1`i)m9k4YEY9S1Z2P+R{H-zriX<~a~NF;Tp09J@ho4bktgNw
zbV;7$vLSZdr{%h7bZkbDF|0;-=!XN9e%ETqR*ibdGZNx4X*bt-8D%Ro%r*L25PuJq
z-fyr7?ls~vz+c9At4VIRt{xZkI+2TyH|%PF<-mg$yjje2u(^6Kli4jnt6$;0ZSJSY
znPI0JFY}%X_cY0HT)VeIGMf+T*)u=isgYeV>YifdUJpD0+@t5RXQtYEEj$B#MYZf!
zZm4(p!i&9DqqmwJ3v~6RLe8QbxMtqB*6v%&NUt-1Y0d<f15W~f#71S)*z;eI)&ekY
zrD0!Wp4yy)aQ13gI4qfEg<R=5*zVhE1itEJ8a2qOzMBI8r5ctZMT!(DQlv<cqF4M2
XKEFGR0lIMV00000NkvXXu0mjf(cxVY

diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png
index 19479998875e60919a20dcc7cf3972029cf47cdf..dfbda8ea3cf35f955d256a20fb65e5a80c9c89fb 100644
GIT binary patch
delta 1681
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
b+P?w2M=?*bRt94L015yANkvXXu0mjf0%bB?

delta 637
zcmV-@0)qX{4Z{VHQGek96b=<Nm`{Yl0006|Nkl<ZSi|j>Pe>I}6vlt=`82FF)55=j
z(94K4ZK09E%SDEZbkRZxT9k_d2?HghWg7_u7cNCC2trVZB7-7wQ7Yj=hytT1B#>&Q
z8D*B(<}(h{d-i7L>BjkBV7@cwo_pr}x#vQF00FibLYuHh27izRlmofIA}|en1AcDS
zkG2BmfEwTxuo~xi1GH^)U~2W}H-N)&oLB_DI%Kzi$VNDGQ5#$aih<u|)AztB$%}xa
zz+LnGQL3G3k>MWkS@B;$hh&H3?0MjTWX-@2>2{>bnVrBA@K(H28>|3TMlTy^my=7T
zekx6*%2VOcYk#F@7f@o1UrC_90~nRg3CXUB_xW|EU4~l4pPE8l4-sGrcrIS7sJ-;#
zOc<C~!G?gSA~gqOCb7OqwU!}12Q2$>Xh_l6Cq6D-=fcKK)AG->-V-XcctE^fyxXOn
zn0fyQ%y@NZ*hD7;JORD{yFJ>=QTq>gSsarym&DgP>wlz=^f$}KakmT8flq4nHB10^
zd=B_o;I^L=`LuYQc%cu6CV?0FSyxC?o=1%AfjNVmy8pv|;IU?!Cp=W)=7<*nV+nNk
z0@Zq)I0D?$p?J{iq(7t7v>4emP?p4;t5?yU1+FThrTTu%9E^XFXWpX@g|LjQ0$oPl
z1T@5PAa-9ik}2ftnt%U%*rS7P%(U?~;5*O=3<CY8&Cyk%cbz#^qRp~Zte+*1D%A_X
zeO=ZP&ZS<3aJ#x@P?70$=w5J{?uf3kF-JC%y5v_YTBX1{&6f`j<6*x;FhGC+0Sx{C
XTr!KS5aI%K00000NkvXXu0mjfu?R5s

diff --git a/mac/Parity/GetBSDProcessList.swift b/mac/Parity/GetBSDProcessList.swift
index 6ee1956e7..6737787be 100644
--- a/mac/Parity/GetBSDProcessList.swift
+++ b/mac/Parity/GetBSDProcessList.swift
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -21,21 +21,21 @@ import Foundation
 import Darwin
 
 public func GetBSDProcessList() -> ([kinfo_proc]?)  {
-	
+
 	var done = false
 	var result: [kinfo_proc]?
 	var err: Int32
-	
+
 	repeat {
 		let name = [CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0];
 		let namePointer = name.withUnsafeBufferPointer { UnsafeMutablePointer<Int32>(mutating: $0.baseAddress) }
 		var length: Int = 0
-		
+
 		err = sysctl(namePointer, u_int(name.count), nil, &length, nil, 0)
 		if err == -1 {
 			err = errno
 		}
-		
+
 		if err == 0 {
 			let count = length / MemoryLayout<kinfo_proc>.stride
 			result = [kinfo_proc](repeating: kinfo_proc(), count: count)
@@ -54,6 +54,6 @@ public func GetBSDProcessList() -> ([kinfo_proc]?)  {
 			}
 		}
 	} while err == 0 && !done
-	
+
 	return result
 }
diff --git a/mac/install-readme.txt b/mac/install-readme.txt
index a68d18ae9..51f0330bb 100644
--- a/mac/install-readme.txt
+++ b/mac/install-readme.txt
@@ -3,8 +3,6 @@ Parity Wallet
 
 Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
 
-WARNING: This installer is **EXPERIMENTAL**. Use it at your own risk.
-
-If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8080/ in your browser.
+If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8180/ in your browser.
 
 Parity is distributed under the terms of the GPL.
diff --git a/mac/uninstall-parity.sh b/mac/uninstall-parity.sh
index a1575308b..840dba1f6 100755
--- a/mac/uninstall-parity.sh
+++ b/mac/uninstall-parity.sh
@@ -9,5 +9,4 @@ fi
 PLIST=~/Library/LaunchAgents/io.parity.ethereum.plist
 su $SUDO_USER -c "launchctl stop io.parity.ethereum"
 su $SUDO_USER -c "launchctl unload $PLIST"
-rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore $PLIST
-
+rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore /usr/local/bin/ethkey /usr/local/bin/parity-evm $PLIST
diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh
index b54bcd6ba..a668ffa13 100755
--- a/scripts/gitlab-build.sh
+++ b/scripts/gitlab-build.sh
@@ -115,7 +115,9 @@ make_rpm () {
 make_pkg () {
   echo "make PKG"
   cp target/$PLATFORM/release/parity target/release/parity
+  cp target/$PLATFORM/release/parity-evm target/release/parity-evm
   cp target/$PLATFORM/release/ethstore target/release/ethstore
+  cp target/$PLATFORM/release/ethkey target/release/ethkey
   cd mac
   xcodebuild -configuration Release
   cd ..