Rename nncp-*cfg commands to have the common prefix

diff --git a/common.mk b/common.mk
index c6559e2c32d5d50402aa3ba3b421d7abe47bb8f0..02dee666cc7c33dbc14172b9dd984db03e75590b 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -19,14 +19,14 @@ LDFLAGS = \
 ALL = \
        nncp-call \
        nncp-caller \
+       nncp-cfgmin \
+       nncp-cfgnew \
        nncp-check \
        nncp-daemon \
        nncp-file \
        nncp-freq \
        nncp-log \
        nncp-mail \
-       nncp-mincfg \
-       nncp-newcfg \
        nncp-pkt \
        nncp-reass \
        nncp-rm \
@@ -42,6 +42,12 @@ nncp-call:
 nncp-caller:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-caller
 
+nncp-cfgmin:
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-cfgmin
+
+nncp-cfgnew:
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-cfgnew
+
 nncp-check:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-check
 
@@ -60,12 +66,6 @@ nncp-log:
 nncp-mail:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-mail
 
-nncp-mincfg:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-mincfg
-
-nncp-newcfg:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-newcfg
-
 nncp-pkt:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-pkt
 

diff --git a/doc/cmds.texi b/doc/cmds.texi
index 58a906dd33a82e62b84c044ddbc404fc944704da..dc4b4efc09262714d297ad04d6798ef61098edb9 100644 (file)
--- a/doc/cmds.texi
+++ b/doc/cmds.texi
@@ -82,6 +82,32 @@ file is renamed from @file{.part} one and when you rerun
 @command{nncp-call} again, remote node will receive completion
 notification.
 
+@node nncp-cfgmin
+@section nncp-cfgmin
+
+@verbatim
+% nncp-cfgmin [options] > stripped.yaml
+@end verbatim
+
+Print out stripped configuration version: only path to @ref{Spool,
+spool}, path to log file, neighbours public keys are stayed. This is
+useful mainly for usage with @ref{nncp-xfer} that has to know only
+neighbours, without private keys involving.
+
+@node nncp-cfgnew
+@section nncp-cfgnew
+
+@verbatim
+% nncp-cfgnew [options] > new.yaml
+@end verbatim
+
+Generate new node configuration: private keys, example configuration
+file and print it to stdout. You must use this command when you setup
+the new node.
+
+Pay attention that private keys generation consumes an entropy from your
+operating system.
+
 @node nncp-check
 @section nncp-check
 
@@ -185,32 +211,6 @@ side will execute specified @ref{CfgSendmail, sendmail} command with
 @option{USER}s appended as a command line argument and feed decompressed
 mail body to that command's stdin.
 
-@node nncp-mincfg
-@section nncp-mincfg
-
-@verbatim
-% nncp-mincfg [options] > stripped.yaml
-@end verbatim
-
-Print out stripped configuration version: only path to @ref{Spool,
-spool}, path to log file, neighbours public keys are stayed. This is
-useful mainly for usage with @ref{nncp-xfer} that has to know only
-neighbours, without private keys involving.
-
-@node nncp-newcfg
-@section nncp-newcfg
-
-@verbatim
-% nncp-newcfg [options] > new.yaml
-@end verbatim
-
-Generate new node configuration: private keys, example configuration
-file and print it to stdout. You must use this command when you setup
-the new node.
-
-Pay attention that private keys generation consumes an entropy from your
-operating system.
-
 @node nncp-pkt
 @section nncp-pkt
 
@@ -370,7 +370,7 @@ remove them.
 @option{-rx} option tells only to move inbound packets addressed to us.
 @option{-tx} option tells exactly the opposite: move only outbound packets.
 
-@ref{nncp-mincfg} could be useful for creating stripped minimalistic
+@ref{nncp-cfgmin} could be useful for creating stripped minimalistic
 configuration file version without any private keys.
 
 @file{DIR} directory has the following structure:

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 289be52458bd76e55db165186a12cb45fb83ec9c..dccde596a9c4f5eee3fbaafad0f81be8efcf86e9 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -24,6 +24,11 @@
 @item
 Опция @option{-minsize} задётся в KiB, а не байтах, для удобства.
 
+@item
+Команда @command{nncp-newcfg} переименована в @command{nncp-cfgnew},
+а @command{nncp-mincfg} в @command{nncp-cfgmin}, для того чтобы они
+имели общий префикс и были сгруппированы для удобства.
+
 @item
 Обновлены зависимые криптографические библиотеки.
 @end itemize

diff --git a/doc/news.texi b/doc/news.texi
index d080ea2c80542d5eea6d6bcbeedf8c2e8a05dc93..5dec744f224a7ec295c2062df9a46f283af9f9bc 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -27,6 +27,11 @@ entry. Useful for transferring big files over small storage devices.
 @option{-minsize} option is specified in KiBs, not bytes, for
 convenience.
 
+@item
+@command{nncp-newcfg} command is renamed to @command{nncp-cfgnew},
+and @command{nncp-mincfg} to @command{nncp-cfgmin} -- now they have
+common prefix and are grouped together for convenience.
+
 @item
 Cryptographic libraries (dependecies) are updated.
 @end itemize

diff --git a/doc/usecases.ru.texi b/doc/usecases.ru.texi
index dee3a329f2385f937fdfd516a8ae16f1ba39bae2..19885c7bda991f28beee869b6d2c055149630f5b 100644 (file)
--- a/doc/usecases.ru.texi
+++ b/doc/usecases.ru.texi
@@ -294,5 +294,5 @@ Bluetooth и WiFi могут быть и довольно быстрыми, по
 вы не "распаковываете" эти пакеты сразу же на том же самом устройстве.
 Распаковка (чтение этих зашифрованных пакетов с извлечением переданных
 файлов и почтовых сообщений) может и должна бы быть произведена на
-отдельном компьютере (@ref{nncp-mincfg} команда может помочь с созданием
+отдельном компьютере (@ref{nncp-cfgmin} команда может помочь с созданием
 конфигурационного файла без приватных ключей для этой цели).

diff --git a/doc/usecases.texi b/doc/usecases.texi
index 65d1c60d2b32cf43d532273383e31c83dfa03c26..5f8fdcbb410e2b5d63b9942175fc3941a8075cda 100644 (file)
--- a/doc/usecases.texi
+++ b/doc/usecases.texi
@@ -274,5 +274,5 @@ and so on -- it is not so bad, because you are not carrying private keys
 with it (don't you?), you do not "toss" those packets immediately on the
 same device. Tossing (reading those encrypted packets and extracting
 transferred files and mail messages) could and should be done on a
-separate computer (@ref{nncp-mincfg} command could help creating
+separate computer (@ref{nncp-cfgmin} command could help creating
 configuration file without private keys for that purpose).

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 2043075ee00b8f47c87bee22a88836f33f074fce..7e2fcb694a861d0a5dd4bee6d7505e0cb6c23d30 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -28,14 +28,14 @@ INSTALL_TARGET=     install-strip
 
 PLIST_FILES=   bin/nncp-call \
                bin/nncp-caller \
+               bin/nncp-cfgmin \
+               bin/nncp-cfgnew \
                bin/nncp-check \
                bin/nncp-daemon \
                bin/nncp-file \
                bin/nncp-freq \
                bin/nncp-log \
                bin/nncp-mail \
-               bin/nncp-mincfg \
-               bin/nncp-newcfg \
                bin/nncp-pkt \
                bin/nncp-reass \
                bin/nncp-rm \

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-mincfg/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-cfgmin/main.go
similarity index 97%
rename from src/cypherpunks.ru/nncp/cmd/nncp-mincfg/main.go
rename to src/cypherpunks.ru/nncp/cmd/nncp-cfgmin/main.go
index 5b5fdf51e1085c0050c6ca5cfc991bb52f9e1770..48df34e0284f45e8a655bc7457c94ca430d7510f 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-mincfg/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-cfgmin/main.go
@@ -32,7 +32,7 @@ import (
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-mincfg -- print stripped configuration\n")
+       fmt.Fprintln(os.Stderr, "nncp-cfgmin -- print stripped configuration\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
 }

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-cfgnew/main.go
similarity index 97%
rename from src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go
rename to src/cypherpunks.ru/nncp/cmd/nncp-cfgnew/main.go
index cd36aa9023a97fe676175513f3fed1e165498265..2601d46532fc8e0a82ebf8894568116d7d348328 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-cfgnew/main.go
@@ -30,7 +30,7 @@ import (
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-newcfg -- generate new configuration and keys\nOptions:")
+       fmt.Fprintln(os.Stderr, "nncp-cfgnew -- generate new configuration and keys\nOptions:")
        flag.PrintDefaults()
 }