Restructuring of some command subtrees

.github/workflows/autorelease.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: OS Packages
         run: |
@@ -42,10 +42,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: Check Out Code
         uses: actions/checkout@v3

.github/workflows/codeql-scanning.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       # Setup go environment
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: Checkout repository
         uses: actions/checkout@v3

.github/workflows/unit-tests.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 90
     steps:
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: OS Packages
         run: |
@@ -49,10 +49,10 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 90
     steps:
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: Mingw
         run: brew install mingw-w64
@@ -80,10 +80,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 90
     steps:
-      - name: Go 1.21
+      - name: Go 1.20
         uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.20"
 
       - name: Check Out Code
         uses: actions/checkout@v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21
+FROM golang:1.20.5
 
 #
 # IMPORTANT: This Dockerfile is used for testing, I do not recommend deploying

client/assets/aliases.go

@@ -28,20 +28,20 @@ const (
 	AliasesDirName = "aliases"
 )
 
-// GetAliasesDir - Returns the path to the config dir
+// GetAliasesDir - Returns the path to the config dir.
 func GetAliasesDir() string {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
 	dir := filepath.Join(rootDir, AliasesDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0700)
+		err = os.MkdirAll(dir, 0o700)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 	return dir
 }
 
-// GetInstalledAliasManifests - Returns a list of installed alias manifests
+// GetInstalledAliasManifests - Returns a list of installed alias manifests.
 func GetInstalledAliasManifests() []string {
 	aliasDir := GetAliasesDir()
 	aliasDirContent, err := os.ReadDir(aliasDir)

client/assets/armories.go

@@ -31,9 +31,9 @@ const (
 )
 
 var (
-	// DefaultArmoryPublicKey - The default public key for the armory
+	// DefaultArmoryPublicKey - The default public key for the armory.
 	DefaultArmoryPublicKey string
-	// DefaultArmoryRepoURL - The default repo url for the armory
+	// DefaultArmoryRepoURL - The default repo url for the armory.
 	DefaultArmoryRepoURL string
 
 	defaultArmoryConfig = &ArmoryConfig{
@@ -42,15 +42,15 @@ var (
 	}
 )
 
-// ArmoryConfig - The armory config file
+// ArmoryConfig - The armory config file.
 type ArmoryConfig struct {
 	PublicKey        string `json:"public_key"`
 	RepoURL          string `json:"repo_url"`
 	Authorization    string `json:"authorization"`
 	AuthorizationCmd string `json:"authorization_cmd"`
 }
 
-// GetArmoriesConfig - The parsed armory config file
+// GetArmoriesConfig - The parsed armory config file.
 func GetArmoriesConfig() []*ArmoryConfig {
 	armoryConfigPath := filepath.Join(GetRootAppDir(), armoryConfigFileName)
 	if _, err := os.Stat(armoryConfigPath); os.IsNotExist(err) {

client/assets/assets.go

@@ -30,42 +30,42 @@ import (
 )
 
 const (
-	// SliverClientDirName - Directory storing all of the client configs/logs
+	// SliverClientDirName - Directory storing all of the client configs/logs.
 	SliverClientDirName = ".sliver-client"
 
 	versionFileName = "version"
 )
 
-// GetRootAppDir - Get the Sliver app dir ~/.sliver-client/
+// GetRootAppDir - Get the Sliver app dir ~/.sliver-client/.
 func GetRootAppDir() string {
 	user, _ := user.Current()
 	dir := filepath.Join(user.HomeDir, SliverClientDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0700)
+		err = os.MkdirAll(dir, 0o700)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 	return dir
 }
 
-// GetClientLogsDir - Get the Sliver client logs dir ~/.sliver-client/logs/
+// GetClientLogsDir - Get the Sliver client logs dir ~/.sliver-client/logs/.
 func GetClientLogsDir() string {
 	logsDir := filepath.Join(GetRootAppDir(), "logs")
 	if _, err := os.Stat(logsDir); os.IsNotExist(err) {
-		err = os.MkdirAll(logsDir, 0700)
+		err = os.MkdirAll(logsDir, 0o700)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 	return logsDir
 }
 
-// GetConsoleLogsDir - Get the Sliver client console logs dir ~/.sliver-client/logs/console/
+// GetConsoleLogsDir - Get the Sliver client console logs dir ~/.sliver-client/logs/console/.
 func GetConsoleLogsDir() string {
 	consoleLogsDir := filepath.Join(GetClientLogsDir(), "console")
 	if _, err := os.Stat(consoleLogsDir); os.IsNotExist(err) {
-		err = os.MkdirAll(consoleLogsDir, 0700)
+		err = os.MkdirAll(consoleLogsDir, 0o700)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -86,10 +86,10 @@ func saveAssetVersion(appDir string) {
 	versionFilePath := filepath.Join(appDir, versionFileName)
 	fVer, _ := os.Create(versionFilePath)
 	defer fVer.Close()
-	fVer.Write([]byte(ver.GitCommit))
+	fVer.WriteString(ver.GitCommit)
 }
 
-// Setup - Extract or create local assets
+// Setup - Extract or create local assets.
 func Setup(force bool, echo bool) {
 	appDir := GetRootAppDir()
 	localVer := assetVersion()

client/assets/extensions.go

@@ -25,24 +25,24 @@ import (
 )
 
 const (
-	// ExtensionsDirName - Directory storing the client side extensions
+	// ExtensionsDirName - Directory storing the client side extensions.
 	ExtensionsDirName = "extensions"
 )
 
-// GetExtensionsDir - Get the Sliver extension directory: ~/.sliver-client/extensions
+// GetExtensionsDir - Get the Sliver extension directory: ~/.sliver-client/extensions.
 func GetExtensionsDir() string {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
 	dir := filepath.Join(rootDir, ExtensionsDirName)
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, 0700)
+		err = os.MkdirAll(dir, 0o700)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 	return dir
 }
 
-// GetInstalledExtensionManifests - Returns a list of installed extension manifests
+// GetInstalledExtensionManifests - Returns a list of installed extension manifests.
 func GetInstalledExtensionManifests() []string {
 	extDir := GetExtensionsDir()
 	extDirContent, err := os.ReadDir(extDir)

client/assets/settings.go

@@ -28,7 +28,7 @@ const (
 	settingsFileName = "tui-settings.json"
 )
 
-// ClientSettings - Client JSON config
+// ClientSettings - Client JSON config.
 type ClientSettings struct {
 	TableStyle        string `json:"tables"`
 	AutoAdult         bool   `json:"autoadult"`
@@ -40,7 +40,7 @@ type ClientSettings struct {
 	ConsoleLogs       bool   `json:"console_logs"`
 }
 
-// LoadSettings - Load the client settings from disk
+// LoadSettings - Load the client settings from disk.
 func LoadSettings() (*ClientSettings, error) {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
 	data, err := os.ReadFile(filepath.Join(rootDir, settingsFileName))
@@ -67,7 +67,7 @@ func defaultSettings() *ClientSettings {
 	}
 }
 
-// SaveSettings - Save the current settings to disk
+// SaveSettings - Save the current settings to disk.
 func SaveSettings(settings *ClientSettings) error {
 	rootDir, _ := filepath.Abs(GetRootAppDir())
 	if settings == nil {