From e8e70c06f7cf004aef4313b2e4ebc14f326293ef Mon Sep 17 00:00:00 2001 From: Yuichi Kobayashi Date: Mon, 12 Jul 2021 23:20:19 +0900 Subject: [PATCH] Fixed "make uninstall" not working for manuals. --- .github/workflows/build-linux.yml | 4 ++-- .github/workflows/build-macos.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- NOTE_ja.md | 2 ++ README_en.md | 30 +++++++++++++++------------ README_ja.md | 30 +++++++++++++++------------ src/Makefile.in | 8 +++---- src/README.txt | 4 ++-- src/configure | 18 ++++++++-------- 9 files changed, 57 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 7b0d112..c559268 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,5 +1,5 @@ -# .github/workflows/build.yml -# Last modified: 10-Jul-2021 (kobayasy) +# .github/workflows/build-linux.yml +# Last modified: 12-Jul-2021 (kobayasy) name: Linux diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 21955b9..097f4c0 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -1,5 +1,5 @@ -# .github/workflows/build.yml -# Last modified: 10-Jul-2021 (kobayasy) +# .github/workflows/build-macos.yml +# Last modified: 12-Jul-2021 (kobayasy) name: macOS diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c966fe3..23e5b71 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,7 +1,7 @@ # .github/workflows/codeql-analysis.yml -# Last modified: 29-Jun-2021 (kobayasy) +# Last modified: 12-Jul-2021 (kobayasy) -name: CodeQL +name: SAST on: push: diff --git a/NOTE_ja.md b/NOTE_ja.md index 421fe32..91783b7 100644 --- a/NOTE_ja.md +++ b/NOTE_ja.md @@ -1,5 +1,7 @@ [[README](README_ja.md)] +--- + ## 使い方のヒント ### パスワード入力の自動化: diff --git a/README_en.md b/README_en.md index 7b0edc1..f09b111 100644 --- a/README_en.md +++ b/README_en.md @@ -1,28 +1,32 @@ [[Japanese/日本語](README_ja.md)] +--- + [![Linux](https://github.com/kobayasy/pSync/workflows/Linux/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-linux.yml) [![macOS](https://github.com/kobayasy/pSync/workflows/macOS/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-macos.yml) [![Windows](https://github.com/kobayasy/pSync/workflows/Windows/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-windows.yml) +/ +[![SAST](https://github.com/kobayasy/pSync/workflows/SAST/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/codeql-analysis.yml)
pSync
-This is an open-source cloud storage. -Securely and speedy synchronize your files by authenticate, encrypt and compress with [OpenSSH]. -So for this to work, you must be able to login to the sync-host with [OpenSSH]. +This is an open-source cloud storage. +Securely and speedy synchronize your files by authenticate, encrypt and compress with [OpenSSH]. +So for this to work, you must be able to login to the sync-host with [OpenSSH]. ### Installation: -This work is required for each sync-host include local-host. -1. Do the following to build and install. +This work is required for each sync-host include local-host. +1. Do the following to build and install. ``` -curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.9/psync-2.9.tar.gz -tar xzf psync-2.9.tar.gz -cd psync-2.9 +curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.10/psync-2.10.tar.gz +tar xzf psync-2.10.tar.gz +cd psync-2.10 ./configure --prefix=$HOME make install ``` -2. Add ~/bin in the PATH if not included. -3. When using for the 1st time, do the following too. -For example, if the sync-directory is `~/pSync`. +2. Add ~/bin in the PATH if not included. +3. When using for the 1st time, do the following too. +For example, if the sync-directory is `~/pSync`. ``` mkdir ~/pSync && chmod 700 ~/pSync cat <<. >~/.psync.conf && chmod 600 ~/.psync.conf @@ -32,11 +36,11 @@ psync pSync ``` ### Uesage: -1. Do the following to show usage. +1. Do the following to show usage. ``` psync --help ``` -2. For example, when synchronizing with `guest@example.com`. +2. For example, when synchronizing with `guest@example.com`. ``` psync guest@example.com ``` diff --git a/README_ja.md b/README_ja.md index 80ed1df..660ec0a 100644 --- a/README_ja.md +++ b/README_ja.md @@ -1,28 +1,32 @@ [[英語/English](README_en.md)] [[使い方のヒント](NOTE_ja.md)] +--- + [![Linux](https://github.com/kobayasy/pSync/workflows/Linux/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-linux.yml) [![macOS](https://github.com/kobayasy/pSync/workflows/macOS/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-macos.yml) [![Windows](https://github.com/kobayasy/pSync/workflows/Windows/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-windows.yml) +/ +[![SAST](https://github.com/kobayasy/pSync/workflows/SAST/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/codeql-analysis.yml)
pSync
-オープンソースのクラウドストーレージです。 -[OpenSSH] によって認証/暗号化/圧縮を行い、安全かつ高速にファイル同期を行ないます。 -よってこれを動かすには、[OpenSSH] で同期先ホストへログイン出来る必要が有ります。 +オープンソースのクラウドストーレージです。 +[OpenSSH] によって認証/暗号化/圧縮を行い、安全かつ高速にファイル同期を行ないます。 +よってこれを動かすには、[OpenSSH] で同期先ホストへログイン出来る必要が有ります。 ### インストール: -ローカルホストを含めた全ての同期ホストに対してこの作業が必要です。 -1. 以下の手順でビルドとインストールを行ないます。 +ローカルホストを含めた全ての同期ホストに対してこの作業が必要です。 +1. 以下の手順でビルドとインストールを行ないます。 ``` -curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.9/psync-2.9.tar.gz -tar xzf psync-2.9.tar.gz -cd psync-2.9 +curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.10/psync-2.10.tar.gz +tar xzf psync-2.10.tar.gz +cd psync-2.10 ./configure --prefix=$HOME make install ``` -2. PATH に ~/bin が含まれていない場合は追加してください。 -3. 始めて使う場合は以下の手順も必要です。 -これは `~/pSync` を同期ディレクトリにする例です。 +2. PATH に ~/bin が含まれていない場合は追加してください。 +3. 始めて使う場合は以下の手順も必要です。 +これは `~/pSync` を同期ディレクトリにする例です。 ``` mkdir ~/pSync && chmod 700 ~/pSync cat <<. >~/.psync.conf && chmod 600 ~/.psync.conf @@ -32,11 +36,11 @@ psync pSync ``` ### 使い方: -1. 以下の手順で使い方が表示されます。 +1. 以下の手順で使い方が表示されます。 ``` psync --help ``` -2. 例えば `guest@example.com` と同期する場合は以下の手順になります。 +2. 例えば `guest@example.com` と同期する場合は以下の手順になります。 ``` psync guest@example.com ``` diff --git a/src/Makefile.in b/src/Makefile.in index 8926c52..ec43b3b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # @configure_input@ -# Makefile.in - Last modified: 10-Jul-2021 (kobayasy) +# Makefile.in - Last modified: 12-Jul-2021 (kobayasy) # # Copyright (c) 2018-2021 by Yuichi Kobayashi # @@ -88,10 +88,10 @@ install-man5ja : $(MAN5JA) uninstall : uninstall-bin uninstall-man1ja uninstall-man5ja uninstall-bin : - $(RM) $(addprefix $(DESTDIR)$(bindir)/,$(TARGET)) + $(RM) $(addprefix $(DESTDIR)$(bindir)/,$(notdir $(TARGET))) uninstall-man1ja : - $(RM) $(addprefix $(DESTDIR)$(mandir)/ja/man1/,$(MAN1JA)) + $(RM) $(addprefix $(DESTDIR)$(mandir)/ja/man1/,$(notdir $(MAN1JA))) uninstall-man5ja : - $(RM) $(addprefix $(DESTDIR)$(mandir)/ja/man5/,$(MAN5JA)) + $(RM) $(addprefix $(DESTDIR)$(mandir)/ja/man5/,$(notdir $(MAN5JA))) diff --git a/src/README.txt b/src/README.txt index c0d38e6..b48cf56 100644 --- a/src/README.txt +++ b/src/README.txt @@ -6,8 +6,8 @@ Installation: This work is required for each sync-host include local-host. 1. Do the following to build and install. --- -tar xzf psync-2.9.tar.gz -cd psync-2.9 +tar xzf psync-2.10.tar.gz +cd psync-2.10 ./configure --prefix=$HOME make install --- diff --git a/src/configure b/src/configure index 74ba376..cf67eca 100755 --- a/src/configure +++ b/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pSync 2.9. +# Generated by GNU Autoconf 2.69 for pSync 2.10. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pSync' PACKAGE_TARNAME='psync' -PACKAGE_VERSION='2.9' -PACKAGE_STRING='pSync 2.9' +PACKAGE_VERSION='2.10' +PACKAGE_STRING='pSync 2.10' PACKAGE_BUGREPORT='kobayasy@kobayasy.com' PACKAGE_URL='http://kobayasy.com/psync/' @@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pSync 2.9 to adapt to many kinds of systems. +\`configure' configures pSync 2.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1307,7 +1307,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pSync 2.9:";; + short | recursive ) echo "Configuration of pSync 2.10:";; esac cat <<\_ACEOF @@ -1394,7 +1394,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pSync configure 2.9 +pSync configure 2.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1763,7 +1763,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pSync $as_me 2.9, which was +It was created by pSync $as_me 2.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4760,7 +4760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pSync $as_me 2.9, which was +This file was extended by pSync $as_me 2.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4823,7 +4823,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pSync config.status 2.9 +pSync config.status 2.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"