aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--AUTHORS7
-rw-r--r--LICENSE22
-rwxr-xr-xpinentry-rofi.sh15
-rw-r--r--scripts/pinentry-rofi.in56
5 files changed, 33 insertions, 68 deletions
diff --git a/.gitignore b/.gitignore
index 270949c..2a0a755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
# SPDX-License-Identifier: CC0-1.0
pinentry-rofi.log
-build
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 366a0ce..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Fredrik Salomonsson <plattfot@posteo.net>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-Contributers to Pinentry-Rofi 2.0.0:
-
- Fredrik Salomonsson <plattfot@gmail.com>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..5a40167
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Copyright © 2023 Matěj Cepl, mcepl at cepl dot eu
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pinentry-rofi.sh b/pinentry-rofi.sh
index d1df300..0eb3e44 100755
--- a/pinentry-rofi.sh
+++ b/pinentry-rofi.sh
@@ -1,10 +1,17 @@
#!/bin/bash
set -eu
-# SPDX-FileCopyrightText: 2016 Quentin "Sardem FF7" Glidic
-# SPDX-FileCopyrightText: 2018-2023 Fredrik Salomonsson <plattfot@posteo.net>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Using inspiration from
+# https://github.com/plattfot/pinentry-rofis
+# by (c) 2018-2023 Fredrik Salomonsson <plattfot <at> posteo <dot> net>
+# which was using inspiration from
+# https://gist.github.com/sardemff7/759cbf956bea20d382a6128c641d2746
+# by (c) 2016 Quentin "Sardem FF7" Glidic
+# however no line of code was actually taken from either script
+# (they are in different language anyway).
+
+# Copyright (c) 2023 Matěj Cepl <mcepl <at> cepl <dot> eu>
+# Licensed under the terms of the include license in the file LICENSE.
# Some documentation
# https://info2html.sourceforge.net/cgi-bin/info2html-demo/info2html?(pinentry)Protocol
diff --git a/scripts/pinentry-rofi.in b/scripts/pinentry-rofi.in
deleted file mode 100644
index 1e1862a..0000000
--- a/scripts/pinentry-rofi.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#! @GUILE@ \
---no-auto-compile -e main -s
-!#
-
-;; SPDX-FileCopyrightText: 2016 Quentin "Sardem FF7" Glidic
-;; SPDX-FileCopyrightText: 2018-2023 Fredrik "PlaTFooT" Salomonsson <plattfot@posteo.net>
-;;
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-(eval-when (load expand eval)
- (set! %load-path
- (cons (format #f "~a/@GUILE_MODULE_DIR@" (dirname (current-filename))) %load-path))
- (set! %load-compiled-path
- (cons (format #f "~a/@GUILE_OBJECT_DIR@" (dirname (current-filename))) %load-compiled-path)))
-
-(use-modules (ice-9 getopt-long)
- (ice-9 format)
- (pinentry-rofi))
-(define (main args)
- (let* ((option-spec
- '((display (single-char #\d) (value #t))
- (xauthority (single-char #\a) (value #t))
- (version (single-char #\v) (value #f))
- (log (value #t))
- (help (single-char #\h) (value #f))))
- (default-display ":0")
- (options (getopt-long (command-line) option-spec))
- (pinentry (make-pinentry #t "Passphrase:" "Ok" "Cancel"
- (option-ref options 'display default-display)
- (let ((logfile (option-ref options 'log #f)))
- (when logfile
- (open-output-file
- (format #f "~a.~a" logfile (getpid)))))
- "C"
- "C")))
- (when (option-ref options 'help #f)
- (format #t "\
-Usage: ~a [OPTIONS]
-Options:
- -d, --display DISPLAY Set display, default is ~s.
- --log LOGFILE Log unknown commands to LOGFILE
- -v, --version Display version.
- -h, --help Display this help.
-Author:
-~a
-"
- (car (command-line))
- default-display
- @AUTHOR@)
- (exit #t))
- (when (option-ref options 'version #f)
- (format #t "~a~%" @HVERSION@)
- (exit #t))
- (format #t "OK Please go ahead\n")
- (force-output)
- (pinentry-loop pinentry (current-input-port))))