Merge remote-tracking branch 'github/master'
Jes Olson jolson@digitalocean.com
Tue, 14 Dec 2021 12:05:36 -0600
2 files changed,
28 insertions(+),
1 deletions(-)
M
LICENSE.md
→
LICENSE.md
@@ -1,3 +1,5 @@
+The project license, including all code that I produce, is GPL3: + GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007@@ -660,3 +662,28 @@ if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>. + +The original license of pash, which I based this project on was MIT. All +unchanged code is still valid under the following license: + +The MIT License (MIT) + +Copyright (c) 2016-2019 Dylan Araps + +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.
M
contrib/pa-rofi
→
contrib/pa-rofi
@@ -2,7 +2,7 @@ #!/bin/sh
cd "${PA_DIR:-$HOME/.local/share/pa}" password_files="$(find * -type f | grep -v '/.git')" -password=$(printf '%s\n' "$password_files" | sed 's/.age//' | rofi -dmenu "$@") +password=$(printf '%s\n' "$password_files" | sed 's/.age//' | rofi -dmenu -i "$@") pa show "$password" | head -n 1 | xdotool type --clearmodifiers --file -