Commit6a1a924

committed

Merge branch 'incoming'

2 parents4110f7c +eb22a95 commit6a1a924Copy full SHA for 6a1a924

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ if [[ "\$HOST_FILE" != "" ]]; then`
`125`	`125`	`use IO::Socket::INET;`
`126`	`126`	`print "let androidInjectionHost =\\"@{[IO::Socket::INET->new(PeerAddr=>'8.8.8.8:53', Proto=>'udp')->sockhost]}\\"\\n";`
`127`	`127`	`PERL`
`128`		`-(diff "\$HOST_FILE" "\$HOST_TMP" \|\| (chmod +w "\$HOST_FILE" && mv -f "\$HOST_TMP" "\$HOST_FILE"))`
	`128`	`+ diff "\$HOST_FILE" "\$HOST_TMP" \|\| (grep NNN.NNN.NNN.NNN "\$HOST_FILE">/dev/null&&chmod +w "\$HOST_FILE";mv -f "\$HOST_TMP" "\$HOST_FILE")`
`129`	`129`	`fi`
`130`	`130`
`131`	`131`	`swift build "\$@"`
`@@ -222,3 +222,10 @@ SCRIPT`
`222`	`222`	`chmod +x {generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&`
`223`	`223`	`echo Created:$SCRIPTS/{generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&`
`224`	`224`	`echo`
	`225`	`+`
	`226`	`+cd"$SWIFT_INSTALL"`
	`227`	`+if [[!-d Injection4Android ]];then`
	`228`	`+ git clone https://github.com/SwiftJava/Injection4Android.git`
	`229`	`+echo"Cloned Injection4Android for runtime code injection"`
	`230`	`+echo"See https://github.com/SwiftJava/Injection4Android"`
	`231`	`+fi`

Comments

(0)