Final changes for v1.1.0

.gitignore

@@ -17,3 +17,6 @@
 
 github.com
 .idea/codeStyles/codeStyleConfig.xml
+
+# Local dirs for development
+build/

api/general/General.go

@@ -56,13 +56,22 @@ func HexTo2Places(h string) string {
 // about Lux
 
 // BuildName is the name of the build
-const BuildName = "v1.0.0"
+const BuildName = "v1.1.0"
 // BuildNo is the build number
-const BuildNo = 0
+const BuildNo = 1
 // GHRepo is the repo url
 const GHRepo = "https://github.com/bandev/lux"
 // License is the license
 const License = "GPL-3.0"
 // Description is the description
 const Description = "Lux is a cli for controlling and monitoring Govee lighting strips"
 
+// GetBits returns x64 or x86 depending on the
+// installed version
+func GetBits() string {
+	if uint64(^uintptr(0)) == ^uint64(0) {
+		return "x64"
+	}
+	return "x86"
+}
+

commands/help/Entry.go

@@ -30,7 +30,7 @@ import (
 // the devices module.
 func Entry() {
 
-	// Get latest commands from server
+	// Get the latest commands from server
 	var c Commands
 	c.Fill()
 
@@ -43,8 +43,8 @@ func Entry() {
 	general.PrintHeading("ABOUT LUX", color.FgWhite)
 	general.PrintBoolParagraph("logged in", color.FgWhite, keymanager.LuxHasAPIKey())
 	general.PrintStringParagraph("description", general.Description, color.FgWhite)
-	general.PrintStringParagraph("build", general.BuildName, color.FgWhite)
+	general.PrintStringParagraph("build", general.BuildName + " (" + general.GetBits() + ")", color.FgWhite)
 	general.PrintStringParagraph("license", general.License, color.FgWhite)
 	general.PrintStringParagraph("repository", general.GHRepo, color.FgWhite)
-	general.PrintBoolParagraph("up to date", color.FgWhite, general.BuildNo == c.BuildNo)
+	general.PrintBoolParagraph("up to date", color.FgWhite, general.BuildNo >= c.BuildNo)
 }

installer/script-x64.iss

@@ -0,0 +1,57 @@
+#define AppName "Lux"
+#define Version "1.1.0"
+#define Publisher "BanDev"
+#define URL "https://bandev.uk/lux"
+#define ExeName "lux.exe"
+
+[Setup]
+AppId={{E17378AA-71AA-4EFC-8B09-B9A18F395B2F}
+AppName={#Name}
+AppVersion={#Version}
+AppPublisher={#Publisher}
+SetupIconFile=src/lux.ico
+UninstallIconFile=src/lux.ico
+UninstallDisplayName={#AppName} (x64)
+AppPublisherURL={#URL}
+DefaultDirName={autopf}\{#AppName}
+DisableDirPage=yes
+DefaultGroupName={#AppName}
+DisableProgramGroupPage=yes
+LicenseFile=src/LICENSE.txt
+PrivilegesRequired=lowest
+OutputDir=/
+OutputBaseFilename=setup-x64
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+ChangesEnvironment=yes
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "src\x64\{#ExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "src\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
+
+[Registry]
+Root: HKCU; Subkey: "Environment"; \
+    ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \
+    Check: NeedsAddPath(ExpandConstant('{app}'))
+
+[Code]
+function NeedsAddPath(Param: string): boolean;
+var
+  OrigPath: string;
+begin
+  if not RegQueryStringValue(HKEY_CURRENT_USER,
+    '\Environment',
+    'Path', OrigPath)
+  then begin
+    Result := True;
+    exit;
+  end;
+  Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
+end;
+

installer/script-x86.iss

@@ -0,0 +1,56 @@
+#define AppName "Lux"
+#define Version "1.1.0"
+#define Publisher "BanDev"
+#define URL "https://bandev.uk/lux"
+#define ExeName "lux.exe"
+
+[Setup]
+AppId={{E17378AA-71AA-4EFC-8B09-B9A18F395B2F}
+AppName={#AppName}
+AppVersion={#Version}
+AppPublisher={#Publisher}
+SetupIconFile=src/lux.ico
+UninstallIconFile=src/lux.ico
+UninstallDisplayName={#AppName} (x86)
+AppPublisherURL={#URL}
+DefaultDirName={autopf}\{#AppName}
+DisableDirPage=yes
+DefaultGroupName={#AppName}
+DisableProgramGroupPage=yes
+LicenseFile=src/LICENSE.txt
+PrivilegesRequired=lowest
+OutputDir=/
+OutputBaseFilename=setup-x86
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+ChangesEnvironment=yes
+ArchitecturesAllowed=x86 x64
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "src\x86\{#ExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "src\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
+
+[Registry]
+Root: HKCU; Subkey: "Environment"; \
+    ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \
+    Check: NeedsAddPath(ExpandConstant('{app}'))
+
+[Code]
+function NeedsAddPath(Param: string): boolean;
+var
+  OrigPath: string;
+begin
+  if not RegQueryStringValue(HKEY_CURRENT_USER,
+    '\Environment',
+    'Path', OrigPath)
+  then begin
+    Result := True;
+    exit;
+  end;
+  Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
+end;
+