@@ -10,10 +10,13 @@ import (
1010 "os"
1111 "path/filepath"
1212
13+ "github.com/akerl/timber/v2/log"
1314 "github.com/mholt/archiver/v3"
15+
16+ "github.com/dock0/ducktape/cmd"
1417)
1518
16- var version = "0.5.0"
19+ var logger = log . NewLogger ( "ducktape" )
1720
1821func usage () {
1922 exampleURL := "https://example.org/download.tar.bz2"
@@ -22,7 +25,11 @@ func usage() {
2225}
2326
2427func getDirPath () (string , error ) {
25- return os .Executable ()
28+ binPath , err := os .Executable ()
29+ if err != nil {
30+ return "" , err
31+ }
32+ return filepath .Dir (binPath ), nil
2633}
2734
2835func getFilePath (name string ) (string , error ) {
@@ -80,6 +87,7 @@ func download(path, url string) error {
8087 if err != nil {
8188 return err
8289 }
90+ logger .InfoMsgf ("Downloading from %s" , url )
8391 response , err := client .Get (url )
8492 if err != nil {
8593 return err
@@ -99,21 +107,23 @@ func execute(url string) error {
99107 if err != nil {
100108 return err
101109 }
110+ logger .InfoMsgf ("Created tmp file %s" , path )
102111 defer os .Remove (path )
103112
104113 err = download (path , url )
105114 if err != nil {
106115 return err
107116 }
108117
118+ logger .InfoMsgf ("Beginning unarchive" )
109119 return archiver .Unarchive (path , "/" )
110120}
111121
112122func main () {
113123 url := os .Getenv ("DUCKTAPE_URL" )
114124 if len (os .Args ) > 1 {
115125 if os .Args [1 ] == "-v" {
116- fmt .Println (version )
126+ fmt .Println (cmd . Version )
117127 return
118128 }
119129 url = os .Args [1 ]
0 commit comments