Remove APPIMAGETOOL_FORCE_SIGN env var

AppImage · Jul 5, 2023 · 26c0f00 · 26c0f00
1 parent 23cfa3f
commit 26c0f00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/appimagetool.c b/src/appimagetool.c
@@ -1034,12 +1034,7 @@ main (int argc, char *argv[])
 
         if (sign) {
             if (!sign_appimage(destination, sign_key, verbose)) {
-                if (getenv(FORCE_SIGN_ENV_VAR) != NULL) {
-                    fprintf(stderr, "ERROR: signing failed, aborting\n");
-                    exit(1);
-                } else {
-                    fprintf(stderr, "ERROR: signing failed, continuing\n");
-                }
+                die("Signing failed, aborting");
             }
         }
 

diff --git a/src/appimagetool_sign.c b/src/appimagetool_sign.c
@@ -358,9 +358,9 @@ bool sign_appimage(char* appimage_filename, char* key_id, bool verbose) {
         if (sscanf(engine_info->version, "%u.%u", &major, &minor) == 2) {
             if (major == 2) {
                 if (minor == 0) {
-                    fprintf(stderr, "[sign] warning: loopback pinentry mode not supported with gpg 2.0.x, %s may not work\n", FORCE_SIGN_ENV_VAR);
+                    fprintf(stderr, "[sign] warning: loopback pinentry mode not supported with gpg 2.0.x, signing may fail silently\n");
                 } else if (minor == 1) {
-                    fprintf(stderr, "[sign] warning: gpg 2.1.x detected, %s can only work with allow-loopback-entry set within the gpg-agent configuration\n", FORCE_SIGN_ENV_VAR);
+                    fprintf(stderr, "[sign] warning: gpg 2.1.x detected, signing may fail silently unless allow-loopback-entry is set within the gpg-agent configuration\n");
                 }
             } else {
                 fprintf(stderr, "[sign] error: unsupported engine version, aborting\n");

diff --git a/src/appimagetool_sign.h b/src/appimagetool_sign.h
@@ -1,7 +1,5 @@
 #pragma once
 
-static const char* const FORCE_SIGN_ENV_VAR = "APPIMAGETOOL_FORCE_SIGN";
-
 bool sign_appimage(char* appimage_filename, char* key_id, bool verbose);
 
 /**