remove bad macos icon

.github/workflows/dos-djgpp.yml

@@ -18,7 +18,7 @@
 # @FileCreated by Neo on 06/19/2023
 # @Maintainer Neo
 
-name: DOS DJGPP
+name: C/C++ CI (DOS DJGPP)
 
 on:
   push:

.github/workflows/freebsd.yml

@@ -18,7 +18,7 @@
  # @FileCreated by techguy16 on 07/23/2023 
  # @Maintainer techguy16 
   
- name: FreeBSD
+ name: C/C++ CI (FreeBSD) 
   
  on: 
   #push:

.github/workflows/linux.yml

@@ -18,7 +18,7 @@
 # @FileCreated by TheTank20 on 06/13/2023
 # @Maintainer Neo
 
-name: Linux
+name: C/C++ CI (Linux)
 
 on:
   push:

.github/workflows/macos.yml

@@ -18,7 +18,7 @@
 # @FileCreated by techguy16 on 07/23/2023
 # @Maintainer techguy16
 
-name: macOS
+name: C/C++ CI (macOS)
 
 on:
   push:

.github/workflows/windows-arm.yml

@@ -18,7 +18,7 @@
 # @FileCreated by TheTank20 on 07/08/2025
 # @Maintainer Neo
 
-name: Windows ARM
+name: C/C++ CI (Windows ARM)
 
 on:
   push:

.github/workflows/windows-x86-x64.yml

@@ -18,7 +18,7 @@
 # @FileCreated by TheTank20 on 07/08/2025
 # @Maintainer Neo
 
-name: Windows x86+64
+name: C/C++ CI (Windows x86+64)
 
 on:
   push:

README.md

@@ -1,26 +1,24 @@
-<p align="center"><img src="https://avatars.githubusercontent.com/u/135211890?s=128&c=0" alt="umskt logo"/></p>
-
-<h1 align="center"><b>U</b>niversal <b>MS</b> <b>K</b>ey <b>T</b>oolkit (UMSKT)</h1>
-
-<p align="center">An open source toolkit designed to generate licence keys for MS products circa 1998 - 2006</p>
-<hr />
+# Universal MS Key Toolkit (UMSKT)
 
 **Connect with us**
 
-[![Discord](https://img.shields.io/discord/1154155510887620729?label=discord&color=%235865F2)](https://discord.gg/PpBSpuphWM)
-[![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
 [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com)
+[![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
+[![Discord](https://img.shields.io/discord/1154155510887620729?label=discord&color=%235865F2)](https://discord.gg/PpBSpuphWM)
 
-----
+**Build status**
 
-| CI Build status |
-| ------------ |
-| [![Windows x86+64](https://github.com/UMSKT/UMSKT/actions/workflows/windows-x86-x64.yml/badge.svg)](../../actions/workflows/windows-x86-x64.yml) |
-| [![Windows ARM](https://github.com/UMSKT/UMSKT/actions/workflows/windows-arm.yml/badge.svg)](../../actions/workflows/windows-arm.yml) |
-| [![macOS](https://github.com/UMSKT/UMSKT/actions/workflows/macos.yml/badge.svg)](../../actions/workflows/macos.yml) |
-| [![Linux](https://github.com/UMSKT/UMSKT/actions/workflows/linux.yml/badge.svg)](../../actions/workflows/linux.yml) |
-| [![FreeBSD](https://github.com/UMSKT/UMSKT/actions/workflows/freebsd.yml/badge.svg)](../../actions/workflows/freebsd.yml) |
-| [![DOS DJGPP](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/dos-djgpp.yml) |
+[![C/C++ CI (Windows x86+64)](https://github.com/UMSKT/UMSKT/actions/workflows/windows-x86-x64.yml/badge.svg)](../../actions/workflows/windows-x86-x64.yml)
+
+[![C/C++ CI (Windows ARM)](https://github.com/UMSKT/UMSKT/actions/workflows/windows-arm.yml/badge.svg)](../../actions/workflows/windows-arm.yml)
+
+[![C/C++ CI (macOS)](https://github.com/UMSKT/UMSKT/actions/workflows/macos.yml/badge.svg)](../../actions/workflows/macos.yml)
+
+[![C/C++ CI (Linux)](https://github.com/UMSKT/UMSKT/actions/workflows/linux.yml/badge.svg)](../../actions/workflows/linux.yml)
+
+[![C/C++ CI (FreeBSD)](https://github.com/UMSKT/UMSKT/actions/workflows/freebsd.yml/badge.svg)](../../actions/workflows/freebsd.yml)
+
+[![C/C++ CI (DOS DJGPP)](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/dos-djgpp.yml)
 
 ------
 

src/cli.cpp

@@ -61,7 +61,7 @@ void CLI::showHelp(char *argv[]) {
     fmt::print("\t-v --verbose\tenable verbose output\n");
     fmt::print("\t-n --number\tnumber of keys to generate (defaults to 1)\n");
     fmt::print("\t-f --file\tspecify which keys file to load\n");
-    fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID (reads from stdin if no argument provided)\n");
+    fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID\n");
     fmt::print("\t-m --mode\tproduct family to activate.\n\t\t\tvalid options are \"WINDOWS\", \"OFFICEXP\", \"OFFICE2K3\", \"OFFICE2K7\" or \"PLUSDME\"\n\t\t\t(defaults to \"WINDOWS\")\n");
     fmt::print("\t-p --productid\tthe product ID of the Program to activate. only required for Office 2K3 and Office 2K7 programs\n");
     fmt::print("\t-b --binkid\tspecify which BINK identifier to load (defaults to 2E)\n");
@@ -168,14 +168,14 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
             options->keysFilename = argv[i+1];
             i++;
         } else if (arg == "-i" || arg == "--instid") {
-            options->applicationMode = MODE_CONFIRMATION_ID;
-            if (i == argc - 1 || argv[i+1][0] == '-') {
-                // No argument provided, will read from stdin later
-                options->instid = "";
-            } else {
-                options->instid = argv[i+1];
-                i++;
+            if (i == argc - 1) {
+                options->error = true;
+                break;
             }
+
+            options->instid = argv[i+1];
+            options->applicationMode = MODE_CONFIRMATION_ID;
+            i++;
         } else if (arg == "-m" || arg == "--mode") {
             std::string mode = argv[i+1];
             char *p = &mode[0];
@@ -369,12 +369,6 @@ bool CLI::stripKey(const char *in_key, char out_key[PK_LENGTH]) {
     return (i == PK_LENGTH);
 }
 
-std::string CLI::readFromStdin() {
-    std::string input;
-    std::getline(std::cin, input);
-    return input;
-}
-
 CLI::CLI(Options options, json keys) {
     this->options = options;
     this->keys = keys;
@@ -578,14 +572,7 @@ int CLI::BINK2002Validate() {
 
 int CLI::ConfirmationID() {
     char confirmation_id[49];
-    std::string instid = this->options.instid;
-    
-    // If instid is empty, read from stdin
-    if (instid.empty()) {
-        instid = readFromStdin();
-    }
-    
-    int err = ConfirmationID::Generate(instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
+    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
 
     switch (err) {
         case ERR_TOO_SHORT:

src/cli.h

@@ -96,7 +96,6 @@ public:
     static void printID(DWORD *pid);
     void printKey(char *pk);
     static bool stripKey(const char *in_key, char out_key[PK_LENGTH]);
-    static std::string readFromStdin();
 
     int BINK1998Generate();
     int BINK2002Generate();