Merge branch 'abra-upgrade' into main
This commit is contained in:
commit
c441a1ab52
2
TODO.md
2
TODO.md
|
@ -42,7 +42,7 @@
|
||||||
- [x] `sync`
|
- [x] `sync`
|
||||||
- [x] `versions`
|
- [x] `versions`
|
||||||
- [x] `lint`
|
- [x] `lint`
|
||||||
- [ ] `upgrade`
|
- [x] `upgrade`
|
||||||
- [x] `version`
|
- [x] `version`
|
||||||
|
|
||||||
## Next phase
|
## Next phase
|
||||||
|
|
|
@ -55,6 +55,7 @@ func RunApp(version, commit string) {
|
||||||
server.ServerCommand,
|
server.ServerCommand,
|
||||||
recipe.RecipeCommand,
|
recipe.RecipeCommand,
|
||||||
VersionCommand,
|
VersionCommand,
|
||||||
|
UpgradeCommand,
|
||||||
},
|
},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
VerboseFlag,
|
VerboseFlag,
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"os/exec"
|
||||||
|
)
|
||||||
|
|
||||||
|
func RunCmd(cmd *exec.Cmd) error {
|
||||||
|
r, err := cmd.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.Stderr = cmd.Stdout
|
||||||
|
done := make(chan struct{})
|
||||||
|
scanner := bufio.NewScanner(r)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for scanner.Scan() {
|
||||||
|
line := scanner.Text()
|
||||||
|
fmt.Println(line)
|
||||||
|
}
|
||||||
|
done <- struct{}{}
|
||||||
|
}()
|
||||||
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
<-done
|
||||||
|
|
||||||
|
if err := cmd.Wait(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
package cli
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os/exec"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/cli/internal"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpgradeCommand upgrades abra in-place.
|
||||||
|
var UpgradeCommand = &cli.Command{
|
||||||
|
Name: "upgrade",
|
||||||
|
Usage: "Upgrade abra",
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
cmd := exec.Command("bash", "-c", "curl -s https://install.abra.coopcloud.tech | bash")
|
||||||
|
if err := internal.RunCmd(cmd); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
|
@ -38,10 +38,10 @@ function install_abra_release {
|
||||||
release_url=$(curl -s "$ABRA_RELEASE_URL" |
|
release_url=$(curl -s "$ABRA_RELEASE_URL" |
|
||||||
python3 -c "import sys, json; \
|
python3 -c "import sys, json; \
|
||||||
payload = json.load(sys.stdin); \
|
payload = json.load(sys.stdin); \
|
||||||
url = [a['browser_download_url'] for a in payload['assets'] if 'arm64' in a['name']][0]; \
|
url = [a['browser_download_url'] for a in payload['assets'] if 'x86_64' in a['name']][0]; \
|
||||||
print(url)")
|
print(url)")
|
||||||
|
|
||||||
echo "downloading $ABRA_VERSION AMD64 binary release for abra..."
|
echo "downloading $ABRA_VERSION x86_64 binary release for abra..."
|
||||||
curl --progress-bar "$release_url" --output "$HOME/.local/bin/abra"
|
curl --progress-bar "$release_url" --output "$HOME/.local/bin/abra"
|
||||||
chmod +x "$HOME/.local/bin/abra"
|
chmod +x "$HOME/.local/bin/abra"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue