Compare commits

..

1 Commits

Author SHA1 Message Date
ಠ_ಠ
e988de266b
Merge 0a48d13d6c into b3440cd87c 2024-02-15 14:24:37 +01:00
2 changed files with 20 additions and 22 deletions

View File

@ -7,7 +7,7 @@ COPY . .
RUN go build RUN go build
FROM restic/restic:0.16.4 FROM restic/restic:0.16.4
RUN apk add --no-cache rclone bash curl docker-cli RUN apk add --no-cache rclone bash curl
COPY --from=builder /app/autorestic /usr/bin/autorestic COPY --from=builder /app/autorestic /usr/bin/autorestic
ENTRYPOINT [] ENTRYPOINT []
CMD [ "autorestic" ] CMD [ "autorestic" ]

View File

@ -6,6 +6,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -36,7 +37,7 @@ func dlJSON(url string) (GithubRelease, error) {
return parsed, err return parsed, err
} }
defer resp.Body.Close() defer resp.Body.Close()
body, err := io.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return parsed, err return parsed, err
@ -72,10 +73,9 @@ func downloadAndInstallAsset(body GithubRelease, name string) error {
// Uncompress // Uncompress
bz := bzip2.NewReader(resp.Body) bz := bzip2.NewReader(resp.Body)
// Save to tmp file in the same directory as the install directory // Save to tmp
// Linux does not support overwriting the file that is currently being running // Linux does not support overwriting the file that is currently being overwritten, but it can be deleted and a new one moved in its place.
// But it can be delete the old one and a new one moved in its place. tmp, err := ioutil.TempFile(os.TempDir(), "autorestic-")
tmp, err := os.CreateTemp(INSTALL_PATH, "autorestic-")
if err != nil { if err != nil {
return err return err
} }
@ -89,25 +89,23 @@ func downloadAndInstallAsset(body GithubRelease, name string) error {
to := path.Join(INSTALL_PATH, name) to := path.Join(INSTALL_PATH, name)
defer os.Remove(tmp.Name()) // Cleanup temporary file after thread exits defer os.Remove(tmp.Name()) // Cleanup temporary file after thread exits
if err := os.Rename(tmp.Name(), to); err != nil {
mode := os.FileMode(0755) colors.Error.Printf("os.Rename() failed (%v), retrying with io.Copy()\n", err.Error())
if originalBin, err := os.Lstat(to); err == nil { var src *os.File
mode = originalBin.Mode() var dst *os.File
err := os.Remove(to) if src, err = os.Open(tmp.Name()); err != nil {
if err != nil {
return err return err
} }
} if dst, err = os.Create(to); err != nil {
err = os.Rename(tmp.Name(), to)
if err != nil {
return err return err
} }
if _, err := io.Copy(dst, src); err != nil {
err = os.Chmod(to, mode)
if err != nil {
return err return err
} }
if err := os.Chmod(to, 0755); err != nil {
return err
}
}
colors.Success.Printf("Successfully installed '%s' under %s\n", name, INSTALL_PATH) colors.Success.Printf("Successfully installed '%s' under %s\n", name, INSTALL_PATH)
return nil return nil