Use Go modules

probonopd · Mar 16, 2020 · a97af9b · a97af9b
1 parent aea326a
commit a97af9b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/appimaged/main.go → src/appimaged/appimaged.go b/src/appimaged/main.go → src/appimaged/appimaged.go
diff --git a/src/appimaged/appwrapper.go b/src/appimaged/appwrapper.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 
 	"github.com/adrg/xdg"
-	"github.com/godbus/dbus"
+	"github.com/godbus/dbus/v5"
 	"github.com/probonopd/go-appimage/internal/helpers"
 	"gopkg.in/ini.v1"
 )

diff --git a/src/appimaged/dbus.go b/src/appimaged/dbus.go
@@ -25,7 +25,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/godbus/dbus"
+	"github.com/godbus/dbus/v5"
 	"github.com/probonopd/go-appimage/internal/helpers"
 	"go.lsp.dev/uri"
 )

diff --git a/src/appimaged/notification.go b/src/appimaged/notification.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 
 	"github.com/esiqveland/notify"
-	"github.com/godbus/dbus"
+	"github.com/godbus/dbus/v5"
 	"github.com/probonopd/go-appimage/internal/helpers"
 )
 

diff --git a/src/appimaged/prerequisites.go b/src/appimaged/prerequisites.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"strings"
 
-	systemddbus "github.com/coreos/go-systemd/dbus"
+	systemddbus "github.com/coreos/go-systemd/v22/dbus"
 	"github.com/probonopd/go-appimage/internal/helpers"
 	"github.com/shirou/gopsutil/process"
 )

diff --git a/src/appimaged/udisks.go b/src/appimaged/udisks.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/probonopd/go-appimage/internal/helpers"
 
-	"github.com/godbus/dbus"
+	"github.com/godbus/dbus/v5"
 )
 
 /*

diff --git a/src/appimagetool/appdirtool.go b/src/appimagetool/appdirtool.go
@@ -197,7 +197,7 @@ func AppDirDeploy(path string) {
 	// PulseAudio
 	handlePulseAudio(appdir)
 
-	ldLinux, err := appdir.GetElfInterpreter()
+	ldLinux, err := appdir.GetElfInterpreter(appdir)
 	if err != nil {
 		helpers.PrintError("Could not determine ELF interpreter", err)
 		os.Exit(1)
@@ -221,13 +221,13 @@ func AppDirDeploy(path string) {
 	}
 
 	if *standalonePtr == true {
-		err = deployInterpreter(ldLinux, err, src, appdir)
+		err = deployInterpreter(ldLinux, src, appdir)
 	} else {
 		log.Println("Not deploying", ldLinux, "because it was not requested or it is not needed")
 	}
 
 	if helpers.Exists(appdir.Path + "/usr/share/glib-2.0/schemas") {
-		err = handleGlibSchemas(appdir, err)
+		err = handleGlibSchemas(appdir)
 		if err != nil {
 			helpers.PrintError("Could not deploy GLib schemas", err)
 		}
@@ -710,7 +710,7 @@ func deployGtkDirectory(appdir helpers.AppDir, gtkVersion int) {
 		var dirswithUiFiles []string
 		for _, uifile := range uifiles {
 			dirswithUiFiles = helpers.AppendIfMissing(dirswithUiFiles, filepath.Dir(uifile))
-			err = PatchFile(appdir.MainExecutable, "/usr", "././")
+			err := PatchFile(appdir.MainExecutable, "/usr", "././")
 			if err != nil {
 				helpers.PrintError("PatchFile", err)
 				os.Exit(1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"github.com/probonopd/go-appimage/internal/helpers"
-    	"github.com/godbus/dbus"
+    	"github.com/godbus/dbus/v5"
     )
     /*
@@ Expand Down @@