diff --git a/Makefile b/Makefile index 957e613..bee27b7 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,13 @@ ifeq ($(OS),Windows_NT) endif else UNAME_S := $(shell uname -s) + UNAME_M := $(shell uname -m) ifeq ($(UNAME_S),Linux) - OS_ARCH := linux_amd64 + ifeq ($(UNAME_M),loongarch64) + OS_ARCH := linux_loong64 + else + OS_ARCH := linux_amd64 + endif endif ifeq ($(UNAME_S),Darwin) OS_ARCH := darwin_$(shell uname -m) @@ -45,4 +50,4 @@ publish: update-deps: go get -u -d - go mod tidy \ No newline at end of file + go mod tidy diff --git a/go.mod b/go.mod index f2c9c50..046498f 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect - golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 // indirect + golang.org/x/sys v0.0.0-20220702020025-31831981b65f // indirect gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 howett.net/plist v1.0.0 ) diff --git a/go.sum b/go.sum index 198c6b5..86cb94c 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 h1:8IVLkfbr2cLhv0a/vKq4UFUcJym8RmDoDboxCFWEjYE= golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220702020025-31831981b65f h1:xdsejrW/0Wf2diT5CPp3XmKUNbr7Xvw8kYilQ+6qjRY= +golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/package-format/bindata.go b/pkg/package-format/bindata.go index 71ba96e..4511e57 100644 --- a/pkg/package-format/bindata.go +++ b/pkg/package-format/bindata.go @@ -1,4 +1,6 @@ -// Code generated for package package_format by go-bindata DO NOT EDIT. (@generated) +// Code generated by go-bindata. (@generated) DO NOT EDIT. + +// Package package_format generated by go-bindata. // sources: // pkg/package-format/appimage/templates/AppRun.sh package package_format @@ -18,7 +20,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } var buf bytes.Buffer @@ -26,7 +28,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } if clErr != nil { return nil, err @@ -62,7 +64,7 @@ func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } -// Mode return file modify time +// ModTime return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } @@ -92,7 +94,7 @@ func appimageTemplatesApprunSh() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "appimage/templates/AppRun.sh", size: 3815, mode: os.FileMode(493), modTime: time.Unix(1561179179, 0)} + info := bindataFileInfo{name: "appimage/templates/AppRun.sh", size: 3815, mode: os.FileMode(493), modTime: time.Unix(1656859817, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -101,8 +103,8 @@ func appimageTemplatesApprunSh() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -127,8 +129,8 @@ func MustAsset(name string) []byte { // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -163,13 +165,13 @@ var _bindata = map[string]func() (*asset, error){ // b.png // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// AssetDir("foo.txt") and AssetDir("nonexistent") would return an error // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") + canonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(canonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -243,6 +245,6 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + canonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) } diff --git a/pkg/package-format/snap/snapScripts.go b/pkg/package-format/snap/snapScripts.go index 18d70d2..2ec0b12 100644 --- a/pkg/package-format/snap/snapScripts.go +++ b/pkg/package-format/snap/snapScripts.go @@ -1,4 +1,6 @@ -// Code generated for package snap by go-bindata DO NOT EDIT. (@generated) +// Code generated by go-bindata. (@generated) DO NOT EDIT. + +// Package snap generated by go-bindata. // sources: // pkg/package-format/snap/desktop-scripts/desktop-common.sh // pkg/package-format/snap/desktop-scripts/desktop-gnome-specific.sh @@ -20,7 +22,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } var buf bytes.Buffer @@ -28,7 +30,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } if clErr != nil { return nil, err @@ -64,7 +66,7 @@ func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } -// Mode return file modify time +// ModTime return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } @@ -94,7 +96,7 @@ func desktopScriptsDesktopCommonSh() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "desktop-scripts/desktop-common.sh", size: 16604, mode: os.FileMode(420), modTime: time.Unix(1614623957, 0)} + info := bindataFileInfo{name: "desktop-scripts/desktop-common.sh", size: 16604, mode: os.FileMode(420), modTime: time.Unix(1656859817, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -114,7 +116,7 @@ func desktopScriptsDesktopGnomeSpecificSh() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "desktop-scripts/desktop-gnome-specific.sh", size: 1401, mode: os.FileMode(420), modTime: time.Unix(1560800605, 0)} + info := bindataFileInfo{name: "desktop-scripts/desktop-gnome-specific.sh", size: 1401, mode: os.FileMode(420), modTime: time.Unix(1656859817, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -134,7 +136,7 @@ func desktopScriptsDesktopInitSh() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "desktop-scripts/desktop-init.sh", size: 1530, mode: os.FileMode(420), modTime: time.Unix(1560800605, 0)} + info := bindataFileInfo{name: "desktop-scripts/desktop-init.sh", size: 1530, mode: os.FileMode(420), modTime: time.Unix(1656859817, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -143,8 +145,8 @@ func desktopScriptsDesktopInitSh() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -169,8 +171,8 @@ func MustAsset(name string) []byte { // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -207,13 +209,13 @@ var _bindata = map[string]func() (*asset, error){ // b.png // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// AssetDir("foo.txt") and AssetDir("nonexistent") would return an error // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") + canonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(canonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -287,6 +289,6 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + canonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) } diff --git a/scripts/build.sh b/scripts/build.sh index c97e616..43a6721 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -24,10 +24,13 @@ GOOS=linux GOARCH=arm go build -ldflags='-s -w' -o linux/arm/app-builder .. mkdir -p linux/arm64 GOOS=linux GOARCH=arm64 go build -ldflags='-s -w' -o linux/arm64/app-builder .. +mkdir -p linux/loong64 +GOOS=linux GOARCH=loong64 go build -ldflags='-s -w' -o linux/loong64/app-builder .. + mkdir -p win/ia32 # set GOARCH=386 GOOS=windows GOARCH=386 go build -o win/ia32/app-builder.exe .. mkdir -p win/x64 # set GOARCH=amd64 -GOOS=windows GOARCH=amd64 go build -o win/x64/app-builder.exe .. \ No newline at end of file +GOOS=windows GOARCH=amd64 go build -o win/x64/app-builder.exe ..