1.diff (4290B)
1 diff --git a/.circleci/config.yml b/.circleci/config.yml 2 index 4fee27f..5f9a38f 100644 3 --- a/.circleci/config.yml 4 +++ b/.circleci/config.yml 5 @@ -41,7 +41,7 @@ jobs: 6 - run: 7 name: Run Build 8 working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/ 9 - command: $GOPATH/bin/qtdeploy build linux 10 + command: /home/user/work/bin/qtdeploy build desktop 11 - run: 12 name: Prepare Deb Generating 13 working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/ 14 @@ -86,7 +86,7 @@ jobs: 15 - run: 16 name: Run Build 17 working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/ 18 - command: $GOPATH/bin/qtdeploy build windows 19 + command: /home/user/work/bin/qtdeploy build windows 20 - store_artifacts: 21 path: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/deploy/windows/Morpheusv2.exe 22 destination: Morpheusv2.exe 23 diff --git a/Gopkg.lock b/Gopkg.lock 24 index 13077c2..ec45e23 100644 25 --- a/Gopkg.lock 26 +++ b/Gopkg.lock 27 @@ -25,15 +25,9 @@ 28 revision = "583c0c0531f06d5278b7d917446061adc344b5cd" 29 version = "v1.0.1" 30 31 -[[projects]] 32 - branch = "master" 33 - name = "github.com/therecipe/qt" 34 - packages = [".","core","gui","widgets"] 35 - revision = "7038382d6c7bb5fd3957df56bbedf8ec4ca6b67c" 36 - 37 [solve-meta] 38 analyzer-name = "dep" 39 analyzer-version = 1 40 - inputs-digest = "a82e2ac4eccca051143202632fee6ebf07b015e82f3d04c4bc426be93aab708b" 41 + inputs-digest = "9eae52af7d8c49e9a27a1863ba05582acb167fd5a5ce5bf23b6eb9288a20d0c2" 42 solver-name = "gps-cdcl" 43 solver-version = 1 44 diff --git a/Gopkg.toml b/Gopkg.toml 45 index a975b22..b1ccb25 100644 46 --- a/Gopkg.toml 47 +++ b/Gopkg.toml 48 @@ -21,10 +21,8 @@ 49 # version = "2.4.0" 50 51 52 -[[constraint]] 53 - branch = "master" 54 - name = "github.com/shibukawa/configdir" 55 +ignored = ["github.com/therecipe/qt/*"] 56 57 [[constraint]] 58 branch = "master" 59 - name = "github.com/therecipe/qt" 60 + name = "github.com/shibukawa/configdir" 61 \ No newline at end of file 62 diff --git a/cmd/root.go b/cmd/root.go 63 index 3374e09..61a0ac4 100644 64 --- a/cmd/root.go 65 +++ b/cmd/root.go 66 @@ -22,8 +22,6 @@ import ( 67 "github.com/spf13/cobra" 68 ) 69 70 -var cfgFile string 71 - 72 // rootCmd represents the base command when called without any subcommands 73 var rootCmd = &cobra.Command{ 74 Use: "Morpheusv2", 75 @@ -48,5 +46,4 @@ func Execute() { 76 fmt.Println(err) 77 os.Exit(1) 78 } 79 - os.Exit(0) 80 } 81 diff --git a/deb.json b/deb.json 82 index 767176a..f710e5e 100644 83 --- a/deb.json 84 +++ b/deb.json 85 @@ -1,7 +1,7 @@ 86 { 87 "name": "Morpheusv2", 88 "maintainer": "MTRNord <info@nordgedanken.de>", 89 - "version": "0.0.1", 90 + "version": "0.1.0", 91 "arch": "amd64", 92 "files": [ 93 { 94 @@ -50,7 +50,7 @@ 95 "description":"A Matrix client written in Go-QT ", 96 "generic-name":"Matrix Client", 97 "exec":"/usr/bin/Morpheusv2.sh", 98 - "icon":"qml/resources/logos/MorpheusBig.png", 99 + "icon":"pkg/qml/resources/logos/MorpheusBig.png", 100 "type":"Application", 101 "keywords":"matrix;Morpheusv2", 102 "startup-notify": false, 103 diff --git a/linter.json b/linter.json 104 new file mode 100644 105 index 0000000..2b2b1f4 106 --- /dev/null 107 +++ b/linter.json 108 @@ -0,0 +1,22 @@ 109 +{ 110 + "Vendor": true, 111 + "Cyclo": 12, 112 + "Deadline": "5m", 113 + "Enable": [ 114 + "vetshadow", 115 + "deadcode", 116 + "gocyclo", 117 + "golint", 118 + "varcheck", 119 + "structcheck", 120 + "ineffassign", 121 + "gas", 122 + "misspell", 123 + "unparam", 124 + "errcheck", 125 + "vet", 126 + "megacheck", 127 + "goconst", 128 + "maligned" 129 + ] 130 +} 131 \ No newline at end of file 132 diff --git a/pkg/app/main.go b/pkg/app/main.go 133 index 5caabde..43d28a6 100644 134 --- a/pkg/app/main.go 135 +++ b/pkg/app/main.go 136 @@ -24,6 +24,7 @@ import ( 137 "path/filepath" 138 ) 139 140 +// Start prepares the Main QT Window and opens it 141 func Start(args []string) error { 142 log.Println("Starting Morpheus v2") 143 144 diff --git a/pkg/mainThreadHelper.go b/pkg/mainThreadHelper.go 145 index 32b4d1a..4311a21 100644 146 --- a/pkg/mainThreadHelper.go 147 +++ b/pkg/mainThreadHelper.go 148 @@ -27,7 +27,7 @@ func Main() { 149 // queue of work to run in main thread. 150 var mainfunc = make(chan func()) 151 152 -// do runs f on the main thread. 153 +// Do runs f on the main thread. 154 func Do(f func()) { 155 done := make(chan bool, 1) 156 mainfunc <- func() {