@@ -106,28 +106,32 @@ func validResult(directory, filename string) error {
106106 return fmt .Errorf ("%s contains no valid ping results" , fullPath )
107107}
108108
109- func compress (directory , filename string ) error {
109+ func compress (directory , filename string ) ( string , error ) {
110110 fullFilename := path .Join (directory , filename )
111111 fileInfo , err := os .Stat (fullFilename )
112112 if err != nil {
113- return fmt .Errorf ("error stating file %s: %w" , fullFilename , err )
113+ return "" , fmt .Errorf ("error stating file %s: %w" , fullFilename , err )
114114 }
115115 if fileInfo .Size () == 0 {
116- return fmt .Errorf ("%s is empty, skipping compression" , fullFilename )
116+ return "" , fmt .Errorf ("%s is empty, skipping compression" , fullFilename )
117117 }
118118 if err := validResult (directory , filename ); err != nil {
119- return fmt .Errorf ("no valid results in %s, skipping compression" , fullFilename )
119+ return "" , fmt .Errorf ("no valid results in %s, skipping compression" , fullFilename )
120120 }
121121
122- cmd := exec .Command ( "tar" , "--zstd" , "-C" , directory , "-cf" , path . Join ( directory , fmt . Sprintf ( "%s.tar.zst" , filename )), filename , "--remove-files" )
122+ var cmd * exec.Cmd
123123 if err := checkZstd (); err != nil {
124124 cmd = exec .Command ("tar" , "-C" , directory , "-cf" , path .Join (directory , fmt .Sprintf ("%s.tar.gz" , filename )), filename , "--remove-files" )
125+ fullFilename = fmt .Sprintf ("%s.tar.gz" , fullFilename )
126+ } else {
127+ cmd = exec .Command ("tar" , "--zstd" , "-C" , directory , "-cf" , path .Join (directory , fmt .Sprintf ("%s.tar.zst" , filename )), filename , "--remove-files" )
128+ fullFilename = fmt .Sprintf ("%s.tar.zst" , fullFilename )
125129 }
126130 log .Debug ().Msgf ("Compression command: %s" , cmd .String ())
127131 cmd .Stdout = os .Stdout
128132 cmd .Stderr = os .Stderr
129133
130- return cmd .Run ()
134+ return fullFilename , cmd .Run ()
131135}
132136
133137func getExternalIP (version int ) string {
0 commit comments