Skyimager fixes.

* Ensure build grabs boot params from entry before starting.

* Fix skyimager archive format.

Author: 志宇

build-skyimager.sh

@@ -19,12 +19,14 @@ go get github.com/lucor/fyne-cross/cmd/fyne-cross || exit 1
   ./cmd/skyimager-gui || exit 1
 
 # Compress bins.
-FYNE=./fyne-cross/bin
+FYNE=$(pwd)/fyne-cross/bin
 TARGETS=("linux-amd64" "darwin-amd64" "windows-amd64")
 
 for target in "${TARGETS[@]}"; do
-  dst="$FYNE/skyimager-$target-$VERSION"
-
-  tar -czf "$dst.tar" "$FYNE/$target" || exit 1
+  cd "$FYNE" || exit 1
+  dst="./skyimager-$target-$VERSION"
+  tar -czf "$dst.tar" "$target"/* || exit 1
   xz -vzT0 "$dst.tar" || exit 1
 done
+
+cd "$(pwd)" || 0

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/SkycoinProject/skywire-mainnet v0.1.2
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/lucor/fyne-cross v1.4.0 // indirect
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/rakyll/statik v0.1.7
 	github.com/sirupsen/logrus v1.5.0

go.sum

@@ -1,4 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+fyne.io/fyne v1.2.2/go.mod h1:Ab+3DIB/FVteW0y4DXfmZv4N3JdnCBh2lHkINI02BOU=
 fyne.io/fyne v1.2.3 h1:5xwtSBNjxxmg+GF/lYvvf4xPzyjgWQoJVrzb+bt5gaA=
 fyne.io/fyne v1.2.3/go.mod h1:JhDdBrPP/Kdr1H5ZT3HW8E/6zlz+GkOldWqSirGBDnY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -140,6 +141,8 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lucor/fyne-cross v1.4.0 h1:AEY8ayoxskmzQF1XBLcnK8IK5/Ejmiaz2IeThM/yOms=
+github.com/lucor/fyne-cross v1.4.0/go.mod h1:lVIalVfFMFxYEbKuaKTskX9NKh07kT5bnoEEqeKGY2U=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=

pkg/imager/fyne.go

@@ -1,6 +1,7 @@
 package imager
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -72,6 +73,27 @@ func (fg *FyneGUI) Run() {
 	fg.w.ShowAndRun()
 }
 
+func (fg *FyneGUI) listBaseImgs() ([]string, string) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
+
+	title := "Please Wait"
+	msg := "Obtaining base image releases from GitHub..."
+	d := dialog.NewProgressInfinite(title, msg, fg.w)
+
+	d.Show()
+	rs, lr, err := ListReleases(ctx, fg.log)
+	d.Hide()
+
+	if err != nil {
+		dialog.ShowError(err, fg.w)
+		return nil, ""
+	}
+
+	fg.releases = rs
+	return releaseStrings(rs), lr.String()
+}
+
 func (fg *FyneGUI) generateBPS() (string, error) {
 	prevIP := fg.gwIP
 	bpsSlice := make([]boot.Params, 0, fg.visors+1)

pkg/imager/fyne_pages.go

@@ -1,15 +1,14 @@
 package imager
 
 import (
-	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 
 	"fyne.io/fyne"
 	"fyne.io/fyne/dialog"
@@ -140,6 +139,7 @@ func (fg *FyneGUI) Page3() fyne.CanvasObject {
 
 	bps := widget.NewMultiLineEntry()
 	bps.SetText(bpsStr)
+
 	conf := pageConfig{
 		I:         3,
 		Name:      "Finalize Boot Parameters",
@@ -155,6 +155,12 @@ func (fg *FyneGUI) Page3() fyne.CanvasObject {
 		},
 		NextText: "Download and Build",
 		Next: func() {
+			// Decode bps entry text to ensure changes are recorded.
+			dec := json.NewDecoder(strings.NewReader(bps.Text))
+			if err := dec.Decode(&fg.bps); err != nil {
+				dialog.ShowError(fmt.Errorf("invalid boot paramters: %v", err), fg.w)
+				return
+			}
 			dialog.ShowConfirm("Confirmation", "Start download and build?", func(b bool) {
 				if b {
 					fg.build()
@@ -164,44 +170,3 @@ func (fg *FyneGUI) Page3() fyne.CanvasObject {
 	}
 	return makePage(fg.w, conf, bps)
 }
-
-func (fg *FyneGUI) latestBaseURL() string {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
-	defer cancel()
-
-	title := "Please Wait"
-	msg := "Obtaining latest base image URL from GitHub..."
-	d := dialog.NewProgressInfinite(title, msg, fg.w)
-
-	d.Show()
-	imgURL, err := LatestBaseImgURL(ctx, fg.log)
-	d.Hide()
-
-	if err != nil {
-		dialog.ShowError(err, fg.w)
-		return ""
-	}
-	fg.baseImg = imgURL
-	return imgURL
-}
-
-func (fg *FyneGUI) listBaseImgs() ([]string, string) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
-	defer cancel()
-
-	title := "Please Wait"
-	msg := "Obtaining base image releases from GitHub..."
-	d := dialog.NewProgressInfinite(title, msg, fg.w)
-
-	d.Show()
-	rs, lr, err := ListReleases(ctx, fg.log)
-	d.Hide()
-
-	if err != nil {
-		dialog.ShowError(err, fg.w)
-		return nil, ""
-	}
-
-	fg.releases = rs
-	return releaseStrings(rs), lr.String()
-}