diff --git a/cmd/backup/archive.go b/cmd/backup/archive.go index d1ca389..87b3466 100644 --- a/cmd/backup/archive.go +++ b/cmd/backup/archive.go @@ -22,8 +22,7 @@ import ( ) func createArchive(files []string, inputFilePath, outputFilePath string, compression string, compressionConcurrency int) error { - inputFilePath = stripTrailingSlashes(inputFilePath) - inputFilePath, outputFilePath, err := makeAbsolute(inputFilePath, outputFilePath) + _, outputFilePath, err := makeAbsolute(stripTrailingSlashes(inputFilePath), outputFilePath) if err != nil { return errwrap.Wrap(err, "error transposing given file paths") } @@ -31,7 +30,7 @@ func createArchive(files []string, inputFilePath, outputFilePath string, compres return errwrap.Wrap(err, "error creating output file path") } - if err := compress(files, outputFilePath, filepath.Dir(inputFilePath), compression, compressionConcurrency); err != nil { + if err := compress(files, outputFilePath, compression, compressionConcurrency); err != nil { return errwrap.Wrap(err, "error creating archive") } @@ -55,7 +54,7 @@ func makeAbsolute(inputFilePath, outputFilePath string) (string, string, error) return inputFilePath, outputFilePath, err } -func compress(paths []string, outFilePath, subPath string, algo string, concurrency int) error { +func compress(paths []string, outFilePath, algo string, concurrency int) error { file, err := os.Create(outFilePath) if err != nil { return errwrap.Wrap(err, "error creating out file") diff --git a/cmd/backup/command.go b/cmd/backup/command.go index d7b52a7..10fa0e1 100644 --- a/cmd/backup/command.go +++ b/cmd/backup/command.go @@ -131,12 +131,8 @@ func (c *command) schedule(strategy configStrategy) error { c.logger.Warn( fmt.Sprintf("Scheduled cron expression %s will never run, is this intentional?", config.BackupCronExpression), ) - - if err != nil { - return errwrap.Wrap(err, "error scheduling") - } - c.schedules = append(c.schedules, id) } + c.schedules = append(c.schedules, id) } return nil