Skip to content

Commit fc4c942

Browse files
Revised paths for autorun and autoinstall. Prepping for 0.1.0 Release of the Demo
1 parent 84aaa62 commit fc4c942

File tree

11 files changed

+48
-37
lines changed

11 files changed

+48
-37
lines changed

.gitignore

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ vendor/linux/x64/thrust_shell
3737

3838
vendor/darwin/x64/ThrustShell.app
3939

40-
release/vendor/linux/x64/content_shell.pak
41-
release/vendor/linux/x64/icudtl.dat
42-
release/vendor/linux/x64/libchromiumcontent.so
43-
release/vendor/linux/x64/libffmpegsumo.so
44-
release/vendor/linux/x64/thrust_shell
40+
release/go-thrust/vendor/linux/x64/content_shell.pak
41+
release/go-thrust/vendor/linux/x64/icudtl.dat
42+
release/go-thrust/vendor/linux/x64/libchromiumcontent.so
43+
release/go-thrust/vendor/linux/x64/libffmpegsumo.so
44+
release/go-thrust/go-thrust/vendor/linux/x64/thrust_shell
4545

46-
release/vendor/darwin/x64/ThrustShell.app
46+
release/vendor/darwin/x64/ThrustShell.app
47+
48+
dist/*

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ Please note Complete Support will never be toggled until Thrust core is stable.
128128

129129
- [ ] SubMenus need order preservation
130130

131-
- [ ] vendor folders need versioning
131+
- [X] vendor folders need versioning
132+
133+
- [X] Need to fix Pathing for autoinstall and autorun. Relative paths will not work for most use cases.
132134

133135
This thrust client exposes enough Methods to be fairly forwards compatible even without adding new helper methods. The beauty of working with a stable JSON RPC Protocol is that most methods are just helpers around build that data structure.
134136

connection/connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var out Out
3434
Initializes threads with Channel Structs
3535
Opens Connection
3636
*/
37-
func InitializeThreads(proto, address string) error {
37+
func InitializeThreads() error {
3838
//c, err := net.Dial(proto, address)
3939
//conn = c
4040

demo.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"flag"
54
"fmt"
65
"os"
76
"runtime"
@@ -18,20 +17,13 @@ import (
1817
)
1918

2019
func main() {
21-
addr := flag.String("socket", "/tmp/_thrust_shell.sock", "unix socket where thrust is running")
22-
autoloaderDisabled := flag.Bool("disable-auto-loader", false, "disable auto running of thrust")
2320

2421
// Parses Flags
2522
InitLogger()
2623

27-
if len(*addr) == 0 {
28-
Log.Errorf("System cannot proceed without a socket to connect to. please use -socket={socket_addr}")
29-
os.Exit(2)
30-
}
31-
32-
connection.StdOut, connection.StdIn = spawn.SpawnThrustCore(*addr, *autoloaderDisabled)
24+
connection.StdOut, connection.StdIn = spawn.SpawnThrustCore()
3325

34-
err := connection.InitializeThreads("unix", *addr)
26+
err := connection.InitializeThreads()
3527
if err != nil {
3628
fmt.Println(err)
3729
os.Exit(2)

makefile

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
build.release:
2-
rm -rf release/vendor/darwin/x64/*
3-
touch release/vendor/darwin/x64/README.md
4-
rm -rf release/vendor/linux/x64/*
5-
touch release/vendor/linux/x64/README.md
6-
cp -rf tools release/
7-
rm -f release/Thrust
8-
go build -o release/Thrust
2+
rm -rf release/go-thrust/vendor/darwin/x64/*
3+
touch release/go-thrust/vendor/darwin/x64/README.md
4+
rm -rf release/go-thrust/vendor/linux/x64/*
5+
touch release/go-thrust/vendor/linux/x64/README.md
6+
cp -rf tools release/go-thrust
7+
rm -f release/go-thrust/Thrust
8+
go build -o release/go-thrust/Thrust
9+
10+
11+
dist.darwin: build.release
12+
mkdir -p dist
13+
cd release && zip -r ../dist/go-thrust-v0.1.0-darwin-x64.zip go-thrust/*
14+
15+
dist.linux: build.release
16+
mkdir -p dist
17+
cd release/
18+
cd release && zip -r ../dist/go-thrust-v0.1.0-linux-x64.zip go-thrust/*
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
wget https://github.com/breach/thrust/releases/download/v$1/thrust-v$1-linux-x64.zip
22
mkdir -p ./vendor/linux/x64/v$1
3-
mv thrust-v$1-linux-x64.zip ./vendor/linux/x64/v$1
4-
cd ./vendor/linux/x64/$1
3+
mv thrust-v$1-linux-x64.zip ./vendor/linux/x64/v$1/thrust-v$1-linux-x64.zip
4+
cd ./vendor/linux/x64/v$1/
55
unzip thrust-v$1-linux-x64.zip
66
rm thrust-v$1-linux-x64.zip

0 commit comments

Comments
 (0)