Follow-up: Sphinx removal

Follow-up of afe0390 & c1b5e1b References remained for sphinx with the argument parsing and local variables.
Fixup: remove dead slam code
2025-01-28 17:38:27 +00:00 · 2024-12-30 23:58:13 +01:00 · 2024-12-30 23:58:13 +01:00 · 2024-12-30 23:56:46 +01:00 · 2024-12-30 23:51:23 +01:00
23 changed files with 92 additions and 100 deletions
--- a/2
+++ b/2
@ -24,7 +24,7 @@ install:
 	install -Dm755 ${PROG} ${DESTDIR}${PREFIX}/bin/${PROG}
 	install -Dm644 doc/${PROG}.1 ${DESTDIR}${MANDIR}/man1/${PROG}.1
 	@echo
-	@echo "Tomb is installed succesfully. To install language translations, make sure"
+	@echo "Tomb is installed successfully. To install language translations, make sure"
 	@echo "gettext is also installed, then 'cd extras/translations' and 'make install' there."
 	@echo
 	@echo "Look around the extras/ directory, it contains other interesting modules."
--- a/extras/android/tomb
+++ b/extras/android/tomb
@ -591,7 +591,7 @@ usage() {
    _print " -q     run quietly without printing informations"
    _print " -D     print debugging information at runtime"
    _print "\000"
-    _print "For more informations on Tomb read the manual: man tomb"
+    _print "For more information on Tomb read the manual: man tomb"
    _print "Please report bugs on <http://github.com/dyne/tomb/issues>."
 }

@ -1087,7 +1087,7 @@ gen_key() {
    header=""
    [[ $KDF == 1 ]] && {
        { option_is_set --kdf } && {
-            # KDF is a new key strenghtening technique against brute forcing
+            # KDF is a new key strengthening technique against brute forcing
            # see: https://github.com/dyne/Tomb/issues/82
            itertime="`option_value --kdf`"
            # removing support of floating points because they can't be type checked well
@ -1194,7 +1194,7 @@ bury_key() {
        _warning "Encoding error: steghide reports problems."
        res=1
    else
-        _success "Tomb key encoded succesfully into image ::1 image file::" $imagefile
+        _success "Tomb key encoded successfully into image ::1 image file::" $imagefile
        res=0
    fi

@ -1270,7 +1270,7 @@ exhume_key() {
    # Report to the user
    [[ "$destkey" = "-" ]] && destkey="stdout"
    [[ $r == 0 ]] && {
-        _success "Key succesfully exhumed to ::1 key::." $destkey
+        _success "Key successfully exhumed to ::1 key::." $destkey
    } || {
        _warning "Nothing found in ::1 image file::" $imagefile
    }
@ -2607,7 +2607,7 @@ main() {
        # DEPRECATION notice (leave here as 'create' is still present in old docs)
        create)
            _warning "The create command is deprecated, please use dig, forge and lock instead."
-            _warning "For more informations see Tomb's manual page (man tomb)."
+            _warning "For more information see Tomb's manual page (man tomb)."
            _failure "Operation aborted."
            ;;

--- a/extras/dismissed/debian/watch
+++ b/extras/dismissed/debian/watch
@ -1,5 +1,5 @@
 version = 3

-# Package mantained by upstream developer
+# Package maintained by upstream developer
 # wishing there would be a way to watch git repos?
 # however our ftp is on ftp://ftp.dyne.org/tomb/releases
--- a/extras/dismissed/tomb-open
+++ b/extras/dismissed/tomb-open
@ -211,7 +211,7 @@ if [ $1 ]; then # is it a file?
            unset  usbkey_mount
        fi

-        if [ $success = 0 ]; then	# mount was succesfull (with password and all)
+        if [ $success = 0 ]; then	# mount was successful (with password and all)
            launch_status ${tombname}
            exit 0
        else
@ -266,7 +266,7 @@ cat <<EOF
  it makes use  of strong encryption and helps you keep  the keys on a
  separate USB storage for safer transports.

-  Inside a Tomb  you can store private informations  without fear that
+  Inside a Tomb  you can store private information without fear that
  other people  possessing it will discover your  secrets, unless they
  have your USB key and your password.

@ -351,7 +351,7 @@ if [ $? = 0 ]; then
 	sudo cp -v ${tombfile}.key ${usbkey_mount}/.tomb/
 	sudo chmod -R go-rwx ${usbkey_mount}/.tomb

-	yes "${tombname}.key succesfully saved on your USB"
+	yes "${tombname}.key successfully saved on your USB"
 	act "now we'll proceed opening your brand new tomb"

 	"${TOMBEXEC}" open -k ${tombfile}.key ${tombfile}
--- a/extras/dismissed/undertaker
+++ b/extras/dismissed/undertaker
@ -76,7 +76,7 @@ function undertaker_scheme() {
 	    obexftp -b $obexdev -g $obexpath 
 	    if [[ $? != 0 ]]; then
 		rmdir ${keytmp}
-		die "a problem occurred retreiving the key via bluetooth."
+		die "a problem occurred retrieving the key via bluetooth."
 	    fi
 	# print out the key on stdout
 	    if option_is_set --path; then
--- a/extras/docker/README.md
+++ b/extras/docker/README.md
@ -52,7 +52,7 @@ Once you understand the concept of docker bind mounts you will be able to run to

 First launch an interactive bash prompt in a temporary instance of the container, and bind-mount a working directory from the host machine where we can output the new tomb volume.

-This will mount the `/tmp/tomb-gen` directy on the host to the location of `/tomb-gen` inside the docker container instance. **Note**: The `/tmp/tomb-gen` directory must already exist on the host.
+This will mount the `/tmp/tomb-gen` directory on the host to the location of `/tomb-gen` inside the docker container instance. **Note**: The `/tmp/tomb-gen` directory must already exist on the host.

 ```bash
 docker run -it --rm --privileged \
@ -60,7 +60,7 @@ docker run -it --rm --privileged \
 	tomb /bin/bash
 ```

-Now from the interative prompt inside the docker continer instance creating a new tomb volume is textbook. **Note**: If you get an error about swap partitions during the `forge` command, this is a host issue and not a container issue. You need to disable swapping on the host if you want to fix it, or use `-f` to forge ahead anyways.
+Now from the interactive prompt inside the docker container instance creating a new tomb volume is textbook. **Note**: If you get an error about swap partitions during the `forge` command, this is a host issue and not a container issue. You need to disable swapping on the host if you want to fix it, or use `-f` to forge ahead anyways.

 ```bash
 cd /tomb-gen
@ -84,7 +84,7 @@ docker run -it --rm --privileged \
 	tomb /bin/bash
 ```

-Now from the interative prompt inside the docker continer instance we can open the tomb volume as usual, referencing the tomb volume, key, and mount destinations bind-mounted to the host:
+Now from the interactive prompt inside the docker container instance we can open the tomb volume as usual, referencing the tomb volume, key, and mount destinations bind-mounted to the host:

 ```bash
 tomb open /tomb-gen/secret.tomb /tomb-mount -k /tomb-gen/secret.tomb.key
@ -98,9 +98,9 @@ tomb close

 ### Unpack and Repack a Tomb Volume

-This workflow was created as a workaround for the MacOS lack of support for bind propagation which prevents us from directly mounting a tomb volume back to the host OS. The workaround is to use an additional bash script layer to copy and synchronize the tomb volume contents between a bind mounted host directory and the mounted tomb volume accesible only from inside the docker container.
+This workflow was created as a workaround for the MacOS lack of support for bind propagation which prevents us from directly mounting a tomb volume back to the host OS. The workaround is to use an additional bash script layer to copy and synchronize the tomb volume contents between a bind mounted host directory and the mounted tomb volume accessible only from inside the docker container.

-The `tomb.sh` script is desinged to run from the host and requires the following ENV VARS to be available to it:
+The `tomb.sh` script is designed to run from the host and requires the following ENV VARS to be available to it:

 * `TOMB_DOCKER_IMAGE`: The name of the docker image on the host. In the examples we named it `tomb`.
 * `TOMB_VOLUME`: The full path of the tomb volume file on the host. In the example it is `/tmp/tomb-gen/secret.tomb`.
--- a/extras/gtomb/gtomb
+++ b/extras/gtomb/gtomb
@ -530,7 +530,7 @@ function _setkey {
 	tombname=`_fsel "Choose a tomb to change its keyfile"`
 	[[ $? = 0 ]] || exec _main

-	keyfile=`_fsel "Chosse your tomb's old keyfile"`
+	keyfile=`_fsel "Choose your tomb's old keyfile"`
 	 [[ $? = 0 ]] || exec _main

 	newkey=`_fsel "Choose your tomb's new keyfile"`
--- a/extras/portable/test/bats/lib/bats-core/tracing.bash
+++ b/extras/portable/test/bats/lib/bats-core/tracing.bash
@ -150,7 +150,7 @@ bats_trim_filename() {
 }

 # normalize a windows path from e.g. C:/directory to /c/directory
-# The path must point to an existing/accessable directory, not a file!
+# The path must point to an existing/accessible directory, not a file!
 bats_normalize_windows_dir_path() { # <output-var> <path>
 	local output_var="$1" path="$2"
 	if [[ "$output_var" != NORMALIZED_INPUT ]]; then
--- a/extras/portable/test/bats_setup
+++ b/extras/portable/test/bats_setup
@ -153,7 +153,7 @@ freebsd_close() {
 	>&2 echo "mnt: $mnt"
 	lkl=`pgrep -f "lklfuse.*$md" | awk '{print $1}'`
 	>&3 echo "kill $lkl (lklfuse on $md)"
-	# trying to deail with lklfuse bug
+	# trying to deal with lklfuse bug
 	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239831
 	renice -20 $lkl
 	kill $lkl
--- a/extras/portable/tomb
+++ b/extras/portable/tomb
@ -125,7 +125,7 @@ freebsd_close() {
 	_verbose "mnt: $mnt"
 	lkl=`pgrep -f "lklfuse.*$md" | awk '{print $1}'`
 	_verbose "kill $lkl (lklfuse on $md)"
-	# trying to deail with lklfuse bug
+	# trying to deal with lklfuse bug
 	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239831
 	renice -20 $lkl
 	kill $lkl
--- a/extras/test/runtests
+++ b/extras/test/runtests
@ -304,7 +304,7 @@ test-set-key() {
    tt open -k /tmp/test.tomb.new.key --unsafe --tomb-pwd ${dummypass} /tmp/test.tomb

    [[ $? = 0 ]] && {
-        notice "Setkey succesfully swapped tomb key"
+        notice "Setkey successfully swapped tomb key"
        results+=(setkey SUCCESS)
        notice "Dump of clear key contents to examine them:"
        print ${dummypass} \
--- a/extras/test/sharness
+++ b/extras/test/sharness
@ -25,7 +25,7 @@ export SHARNESS_VERSION
 : ${SHARNESS_TEST_EXTENSION:=t}
 export SHARNESS_TEST_EXTENSION

-#  Reset TERM to original terminal if found, otherwise save orignal TERM
+#  Reset TERM to original terminal if found, otherwise save original TERM
 [ "x" = "x$SHARNESS_ORIG_TERM" ] &&
 		SHARNESS_ORIG_TERM="$TERM" ||
 		TERM="$SHARNESS_ORIG_TERM"
@ -177,7 +177,7 @@ trap 'die' EXIT
 # implicitly by specifying the prerequisite name in calls to test_expect_success
 # or test_expect_failure.
 #
-# $1 - Name of prerequiste (a simple word, in all capital letters by convention)
+# $1 - Name of prerequisite (a simple word, in all capital letters by convention)
 #
 # Examples
 #
@ -570,7 +570,7 @@ test_expect_code() {

 # Public: Compare two files to see if expected output matches actual output.
 #
-# The TEST_CMP variable defines the command used for the comparision; it
+# The TEST_CMP variable defines the command used for the comparison; it
 # defaults to "diff -u". Only when the test script was started with --verbose,
 # will the command's output, the diff, be printed to the standard output.
 #
--- a/extras/translations/de.po
+++ b/extras/translations/de.po
@ -647,7 +647,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Grabschlüssel erfolgreich im Bild ::1 image file:: enkodiert"

 #: tomb:Key operations:exhume_key:1752
@ -691,7 +691,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Versuche Schlüssel aus Bild ::1 image file:: zu exhumieren"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Schlüssel erfolgreich exhumiert in ::1 key::."

 #: tomb:Key operations:exhume_key:1821
@ -720,7 +720,7 @@ msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Grabschlüssel erfolgreich im Bild ::1 image file:: enkodiert"

 #: tomb:Key operations:decloakify_key:1879
@ -750,7 +750,7 @@ msgstr "gebe exhumierten Schlüssel auf der Standardausgabe aus"

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Schlüssel erfolgreich exhumiert in ::1 key::."

 #: tomb:Key operations:decloakify_key:1925
@ -1513,7 +1513,7 @@ msgstr ""
 "lock."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."

 #: tomb:Main routine:main:3489
--- a/extras/translations/es.po
+++ b/extras/translations/es.po
@ -626,7 +626,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Error en la codficación: steghide reporta problemas."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Llave codificada con éxito en la imagen ::1 fichero::"

 #: tomb:Key operations:exhume_key:1752
@ -671,7 +671,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Intentando exhumar una llave de la imagen ::1 fichero::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Llave exhumada con éxito en ::1 llave::."

 #: tomb:Key operations:exhume_key:1821
@ -700,7 +700,7 @@ msgstr "Error en la codficación: steghide reporta problemas."

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Llave codificada con éxito en la imagen ::1 fichero::"

 #: tomb:Key operations:decloakify_key:1879
@ -730,7 +730,7 @@ msgstr "mostrando llave exhumada en stdout"

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Llave exhumada con éxito en ::1 llave::."

 #: tomb:Key operations:decloakify_key:1925
@ -1476,7 +1476,7 @@ msgstr ""
 "lugar."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Para más información mira el manual de Tomb (man tomb)."

 #: tomb:Main routine:main:3489
--- a/extras/translations/fi.po
+++ b/extras/translations/fi.po
@ -605,7 +605,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Koodausvirhe: steghide ilmoittaa ongelmista."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Tomb-avain koodattu onnistuneesti kuvaksi ::1 image file::"

 #: tomb:Key operations:exhume_key:1752
@ -649,7 +649,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Yritetään kaivaa avainta pois kuvasta ::1 image file::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Avain kaivettiin onnistuneesti ::1 key:: :lle."

 #: tomb:Key operations:exhume_key:1821
@ -673,7 +673,7 @@ msgid "Encoding error: cloakify reports problems."
 msgstr "Koodausvirhe: cloakify raportoi ongelmista."

 #: tomb:Key operations:cloakify_key:1867
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Tomb-avain koodattu onnistuneesti"

 #: tomb:Key operations:decloakify_key:1879
@ -700,7 +700,7 @@ msgid "printing uncloaked key on stdout"
 msgstr "peittämättömän avaimen tulostaminen stdoutiin"

 #: tomb:Key operations:decloakify_key:1923
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Onnistuneen avaimen peitteen poisto ::1 key:: :lle."

 #: tomb:Key operations:decloakify_key:1925
@ -1414,7 +1414,7 @@ msgstr ""
 "komentoa."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Katso lisätietoja Tombin käsikirjan sivulta ('man tomb')."

 #: tomb:Main routine:main:3489
--- a/extras/translations/fr.po
+++ b/extras/translations/fr.po
@ -676,7 +676,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Erreur à l'encodage : steghide rapporte des problèmes."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "La clé Tomb a été encodée dans l'image ::1 image file::"

 #: tomb:Key operations:exhume_key:1752
@ -720,7 +720,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Tentative d'exhumer une clé de l'image ::1 image file::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "La clé a été correctement exhumé vers ::1 key::."

 #: tomb:Key operations:exhume_key:1821
@ -749,7 +749,7 @@ msgstr "Erreur à l'encodage : steghide rapporte des problèmes."

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "La clé Tomb a été encodée dans l'image ::1 image file::"

 #: tomb:Key operations:decloakify_key:1879
@ -779,7 +779,7 @@ msgstr "Impression de la clé exhumée sur la sortie standard"

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "La clé a été correctement exhumé vers ::1 key::."

 #: tomb:Key operations:decloakify_key:1925
@ -1547,7 +1547,7 @@ msgstr ""
 "\"dig\", \"forge\", et \"lock\"."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr ""
 "Pour de plus amples informations, se référer au manuel de Tomb (man tomb)."

--- a/extras/translations/it.po
+++ b/extras/translations/it.po
@ -642,7 +642,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Errore codifica: steghide riporta problemi."

 #: tomb:Key operations:bury_key:1740 operations:bury_key:1272
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Tomb key codificata con successo nell'immagine ::1 image file::"

 #: tomb:Key operations:exhume_key:1752 operations:exhume_key:1284
@ -686,7 +686,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Provo l'exhume della key dall'immagine ::1 image file::"

 #: tomb:Key operations:exhume_key:1819 operations:exhume_key:1348
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Key exhume riuscito su ::1 key::."

 #: tomb:Key operations:exhume_key:1821 operations:exhume_key:1350
@ -715,7 +715,7 @@ msgstr "Errore codifica: steghide riporta problemi."

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Tomb key codificata con successo nell'immagine ::1 image file::"

 #: tomb:Key operations:decloakify_key:1879
@ -745,7 +745,7 @@ msgstr "stampo l'exhumed key a video"

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Key exhume riuscito su ::1 key::"

 #: tomb:Key operations:decloakify_key:1925
@ -1489,7 +1489,7 @@ msgstr ""
 "Il comando create è obsoleto, per favore usa i comandi dig, forge e lock."

 #: tomb:Main routine:main:3448 routine:main:2706
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Per maggiori informazioni consulta i manuali di Tomb (man tomb)."

 #: tomb:Main routine:main:3489
@ -1713,7 +1713,7 @@ msgid " -D     print debugging information at runtime"
 msgstr " -D     mostra le informazioni di debug/runtime"

 #: tomb:Commandline interaction:usage:664
-msgid "For more informations on Tomb read the manual: man tomb"
+msgid "For more information on Tomb read the manual: man tomb"
 msgstr "Per maggiori informazioni su Tomb leggi il manuale: man tomb"

 #: tomb:Key operations:list_gnupg_ciphers:1215
--- a/extras/translations/pt_BR.po
+++ b/extras/translations/pt_BR.po
@ -612,7 +612,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Erro de codificação: steghide relata problemas."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr ""
 "Chave de tumba codificada com sucesso na imagem ::1 arquivo de imagem::"

@ -658,7 +658,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Tentando exumar uma chave da imagem ::1 arquivo de imagem::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Chave exumada com sucesso para ::1 chave::."

 #: tomb:Key operations:exhume_key:1821
@ -683,7 +683,7 @@ msgid "Encoding error: cloakify reports problems."
 msgstr "Erro de codificação: ocultação relata problemas."

 #: tomb:Key operations:cloakify_key:1867
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Chave da tumba codificada com sucesso"

 #: tomb:Key operations:decloakify_key:1879
@ -709,7 +709,7 @@ msgid "printing uncloaked key on stdout"
 msgstr "imprimindo chave descoberta em stdout"

 #: tomb:Key operations:decloakify_key:1923
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Chave revelada com sucesso para ::1 chave::."

 #: tomb:Key operations:decloakify_key:1925
@ -1441,7 +1441,7 @@ msgstr ""
 "lugar."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Para mais informações veja a página de manual do Tomb (man tomb)."

 #: tomb:Main routine:main:3489
--- a/extras/translations/ru.po
+++ b/extras/translations/ru.po
@ -636,7 +636,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Ошибка шифрования: steghide сообщает о проблемах."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Ключ от гробницы успешно закодирован в изображение ::1 image file::"

 #: tomb:Key operations:exhume_key:1752
@ -680,7 +680,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Пытаюсь эксгумировать ключ из изображения ::1 image file::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Ключ успешно эксгумирован в ::1 key::."

 #: tomb:Key operations:exhume_key:1821
@ -709,7 +709,7 @@ msgstr "Ошибка шифрования: steghide сообщает о проб

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Ключ от гробницы успешно закодирован"

 #: tomb:Key operations:decloakify_key:1879
@ -739,7 +739,7 @@ msgstr "вывод эксгумированного ключа в стандар

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Ключ успешно эксгумирован в ::1 key::."

 #: tomb:Key operations:decloakify_key:1925
@ -1475,7 +1475,7 @@ msgstr ""
 "неё."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "Для большей информации обратитесь к руководству Tomb (man tomb)."

 #: tomb:Main routine:main:3489
--- a/extras/translations/sv.po
+++ b/extras/translations/sv.po
@ -626,7 +626,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Kodningsfel: steghide raporterar problem."

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr "Tomb-nyckel skapad i bild ::1 image file::"

 #: tomb:Key operations:exhume_key:1752
@ -670,7 +670,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Försöker extrahera nyckel ur bild ::1 image file::"

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr "Nyckel extraherad till ::1 key::."

 #: tomb:Key operations:exhume_key:1821
@ -699,7 +699,7 @@ msgstr "Kodningsfel: steghide raporterar problem."

 #: tomb:Key operations:cloakify_key:1867
 #, fuzzy
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr "Tomb-nyckel skapad i bild ::1 image file::"

 #: tomb:Key operations:decloakify_key:1879
@ -729,7 +729,7 @@ msgstr "skriver extraherad nyckel till stdout"

 #: tomb:Key operations:decloakify_key:1923
 #, fuzzy
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr "Nyckel extraherad till ::1 key::."

 #: tomb:Key operations:decloakify_key:1925
@ -1454,7 +1454,7 @@ msgid ""
 msgstr "Skapa kommandot är föråldrat, använd gräv, smedja och lås istället."

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr "För mer information se Tombs manualsidor (man tomb)."

 #: tomb:Main routine:main:3489
--- a/extras/translations/tomb.pot
+++ b/extras/translations/tomb.pot
@ -566,7 +566,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr ""

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr ""

 #: tomb:Key operations:exhume_key:1752
@ -610,7 +610,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr ""

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr ""

 #: tomb:Key operations:exhume_key:1821
@ -634,7 +634,7 @@ msgid "Encoding error: cloakify reports problems."
 msgstr ""

 #: tomb:Key operations:cloakify_key:1867
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr ""

 #: tomb:Key operations:decloakify_key:1879
@ -658,7 +658,7 @@ msgid "printing uncloaked key on stdout"
 msgstr ""

 #: tomb:Key operations:decloakify_key:1923
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr ""

 #: tomb:Key operations:decloakify_key:1925
@ -1326,7 +1326,7 @@ msgid "The create command is deprecated, please use dig, forge and lock instead.
 msgstr ""

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr ""

 #: tomb:Main routine:main:3489
--- a/extras/translations/zh_Hans.po
+++ b/extras/translations/zh_Hans.po
@ -567,7 +567,7 @@ msgid "Encoding error: steghide reports problems."
 msgstr ""

 #: tomb:Key operations:bury_key:1740
-msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgid "Tomb key encoded successfully into image ::1 image file::"
 msgstr ""

 #: tomb:Key operations:exhume_key:1752
@ -611,7 +611,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr ""

 #: tomb:Key operations:exhume_key:1819
-msgid "Key succesfully exhumed to ::1 key::."
+msgid "Key successfully exhumed to ::1 key::."
 msgstr ""

 #: tomb:Key operations:exhume_key:1821
@ -635,7 +635,7 @@ msgid "Encoding error: cloakify reports problems."
 msgstr ""

 #: tomb:Key operations:cloakify_key:1867
-msgid "Tomb key encoded succesfully"
+msgid "Tomb key encoded successfully"
 msgstr ""

 #: tomb:Key operations:decloakify_key:1879
@ -659,7 +659,7 @@ msgid "printing uncloaked key on stdout"
 msgstr ""

 #: tomb:Key operations:decloakify_key:1923
-msgid "Key succesfully uncloaked to ::1 key::."
+msgid "Key successfully uncloaked to ::1 key::."
 msgstr ""

 #: tomb:Key operations:decloakify_key:1925
@ -1339,7 +1339,7 @@ msgid ""
 msgstr ""

 #: tomb:Main routine:main:3448
-msgid "For more informations see Tomb's manual page (man tomb)."
+msgid "For more information see Tomb's manual page (man tomb)."
 msgstr ""

 #: tomb:Main routine:main:3489
--- a/42
+++ b/42
@ -212,7 +212,7 @@ _is_found() {
 	return $?
 }

-# Track acces and modification time of tomb files.
+# Track access and modification time of tomb files.
 # $1: file to track
 # date format: seconds since Epoch
 # stat format: <last access>:<last modified>
@ -386,7 +386,7 @@ _is_encrypted_block() {
 	[[ $? -eq 0 ]] && s="--inverse"

 	_sudo lsblk $s -o type -n $b 2>/dev/null \
-		| egrep -q '^crypt$'
+		| grep -Eq '^crypt$'

 	return $?
 }
@ -756,7 +756,7 @@ usage() {
 	echo
 	_print " -h           print this help"
 	_print " -v           print version, license and list of available ciphers"
-	_print " -q           run quietly without printing informations"
+	_print " -q           run quietly without printing information"
 	_print " -D           print debugging information at runtime"
 	echo
 	_print "For more information on Tomb read the manual: man tomb"
@ -1405,8 +1405,6 @@ gen_key() {
 	local gpgpass opt
 	local recipients_opt
 	typeset -a gpgopt
-	local sphx_host_tmp
-	local sphx_user_tmp
 	# here user is prompted for key password
 	tombpass=""
 	tombpasstmp=""
@ -1474,7 +1472,7 @@ gen_key() {
 		header=""
 		[[ $KDF == 1 ]] && {
 			{ option_is_set --kdf } && {
-				# KDF is a new key strenghtening technique against brute forcing
+				# KDF is a new key strengthening technique against brute forcing
 				# see: https://github.com/dyne/Tomb/issues/82
 				itertime="`option_value --kdf`"
 				# removing support of floating points because they can't be type checked well
@ -1646,7 +1644,7 @@ bury_key() {
 		_warning "Encoding error: steghide reports problems."
 		res=1
 	else
-		_success "Tomb key encoded succesfully into image ::1 image file::" $imagefile
+		_success "Tomb key encoded successfully into image ::1 image file::" $imagefile
 		res=0
 	fi

@ -1725,7 +1723,7 @@ exhume_key() {
 	# Report to the user
 	[[ "$destkey" = "-" ]] && destkey="stdout"
 	[[ $r == 0 ]] && {
-		_success "Key succesfully exhumed to ::1 key::." $destkey
+		_success "Key successfully exhumed to ::1 key::." $destkey
 	} || {
 		_warning "Nothing found in ::1 image file::" $imagefile
 	}
@ -1774,7 +1772,7 @@ cloakify_key() {
 		_warning "Encoding error: cloakify reports problems."
 		res=1
 	else
-		_success "Tomb key encoded succesfully"
+		_success "Tomb key encoded successfully"
 		res=0
 	fi

@ -1834,7 +1832,7 @@ decloakify_key() {
 	# Report to the user
 	[[ -z "$destkey" ]] && destkey="stdout"
 	[[ $r == 0 ]] && {
-		_success "Key succesfully uncloaked to ::1 key::." $destkey
+		_success "Key successfully uncloaked to ::1 key::." $destkey
 	} || {
 		_warning "Nothing found in ::1 text file::" $textfile
 	}
@ -3131,19 +3129,19 @@ main() {
 	main_opts=(q -quiet=q D -debug=D h -help=h v -version=v f -force=f -tmp: U: G: T: -no-color -unsafe g -gpgkey=g -sudo:)
 	subcommands_opts[__default]=""
 	# -o in open and mount is used to pass alternate mount options
-	subcommands_opts[open]="n -nohook=n k: -kdf: -kdftype: -kdfmem: o: -ignore-swap -tomb-pwd: r: R: -sphx-host: -sphx-user: p -preserve-ownership=p"
+	subcommands_opts[open]="n -nohook=n k: -kdf: -kdftype: -kdfmem: o: -ignore-swap -tomb-pwd: r: R: p -preserve-ownership=p"
 	subcommands_opts[mount]=${subcommands_opts[open]}

 	subcommands_opts[create]="" # deprecated, will issue warning

 	# -o in forge and lock is used to pass an alternate cipher.
-	subcommands_opts[forge]="-ignore-swap k: -kdf: -kdftype: -kdfmem: o: -tomb-pwd: -use-random r: R: -sphx-host: -sphx-user: "
+	subcommands_opts[forge]="-ignore-swap k: -kdf: -kdftype: -kdfmem: o: -tomb-pwd: -use-random r: R: "
 	subcommands_opts[dig]="-ignore-swap s: -size=s "
-	subcommands_opts[lock]="-ignore-swap k: -kdf: -kdftype: -kdfmem: o: -tomb-pwd: r: R: -sphx-host: -sphx-user: -filesystem: "
-	subcommands_opts[setkey]="k: -ignore-swap -kdf: -kdftype: -kdfmem: -tomb-old-pwd: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
+	subcommands_opts[lock]="-ignore-swap k: -kdf: -kdftype: -kdfmem: o: -tomb-pwd: r: R: -filesystem: "
+	subcommands_opts[setkey]="k: -ignore-swap -kdf: -kdftype: -kdfmem: -tomb-old-pwd: -tomb-pwd: r: R: "
 	subcommands_opts[engrave]="k: "

-	subcommands_opts[passwd]="k: -ignore-swap -kdf: -kdftype: -kdfmem: -tomb-old-pwd: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
+	subcommands_opts[passwd]="k: -ignore-swap -kdf: -kdftype: -kdfmem: -tomb-old-pwd: -tomb-pwd: r: R: "
 	subcommands_opts[close]=""
 	subcommands_opts[help]=""
 	subcommands_opts[slam]=""
@ -3153,8 +3151,8 @@ main() {
 	subcommands_opts[index]=""
 	subcommands_opts[search]=""

-	subcommands_opts[bury]="k: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
-	subcommands_opts[exhume]="k: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
+	subcommands_opts[bury]="k: -tomb-pwd: r: R: "
+	subcommands_opts[exhume]="k: -tomb-pwd: r: R: "
 	subcommands_opts[cloak]="k: "
 	subcommands_opts[uncloak]="k: "
 	# subcommands_opts[decompose]=""
@ -3162,7 +3160,7 @@ main() {
 	# subcommands_opts[install]=""
 	subcommands_opts[askpass]=""
 	subcommands_opts[source]=""
-	subcommands_opts[resize]="-ignore-swap s: -size=s k: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
+	subcommands_opts[resize]="-ignore-swap s: -size=s k: -tomb-pwd: r: R: "
 	subcommands_opts[check]="-ignore-swap "
 	#	 subcommands_opts[translate]=""

@ -3277,7 +3275,7 @@ main() {
 		# DEPRECATION notice (leave here as 'create' is still present in old docs)
 		create)
 			_warning "The create command is deprecated, please use dig, forge and lock instead."
-			_warning "For more informations see Tomb's manual page (man tomb)."
+			_warning "For more information see Tomb's manual page (man tomb)."
 			_failure "Operation aborted."
 			;;

@ -3317,12 +3315,6 @@ main() {

 		# Close the tomb
 		umount|close)
-			[[ "$subcommand" == "slam" ]] && {
-				SLAM=1
-				[[ $LSOF == 0 ]] && {
-					unset SLAM
-					_warning "lsof not installed: cannot slam tombs."
-					_warning "Trying a regular close." }}
 			umount_tomb $PARAM[1]
 			;;
Author	SHA1	Message	Date
Narrat	9905840314	Follow-up: Sphinx removal Follow-up of afe0390 & c1b5e1b References remained for sphinx with the argument parsing and local variables.	2024-12-30 23:58:13 +01:00
Narrat	2750488938	Fixup: remove dead slam code Part of 653609a got reverted after a rebase.	2024-12-30 23:58:13 +01:00
Andreas Deininger	b6f12885e2	Fix typos	2024-12-30 23:56:46 +01:00
Narrat	e378da43b1	change egrep to grep -E egrep and fgrep are deemed obsolete and usage issues a warning since a few versions. To quote the respective notification: 7th Edition Unix had commands egrep and fgrep that were the counterparts of the modern ‘grep -E’ and ‘grep -F’. Although breaking up grep into three programs was perhaps useful on the small computers of the 1970s, egrep and fgrep were deemed obsolescent by POSIX in 1992, removed from POSIX in 2001, deprecated by GNU Grep 2.5.3 in 2007, and changed to issue obsolescence warnings by GNU Grep 3.8 in 2022; eventually, they are planned to be removed entirely. Closes #553	2024-12-30 23:51:23 +01:00