From 82633595b405b25d0e7b28cc8f8b95530a79c4a8 Mon Sep 17 00:00:00 2001 From: Manpreet Singh Date: Thu, 16 Mar 2017 10:39:20 -0700 Subject: [PATCH 1/2] Fixed name shown to match actual script name --- syncthing-resolve-conflicts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing-resolve-conflicts.sh b/syncthing-resolve-conflicts.sh index 662e7be..2e490cf 100755 --- a/syncthing-resolve-conflicts.sh +++ b/syncthing-resolve-conflicts.sh @@ -3,7 +3,7 @@ # Check for sync conflicts and resolve them. Idea from the shell # script 'pacdiff'. -declare -r myname='syncthing-resolve-conflicts.sh' +declare -r myname='syncthing-resolve-conflicts' declare -r myver='1.0.0' diffprog=${DIFFPROG:-'vim -d'} From 62745fa37b642f615bf7b07062ff3fa802e2cb6e Mon Sep 17 00:00:00 2001 From: Manpreet Singh Date: Thu, 16 Mar 2017 11:23:38 -0700 Subject: [PATCH 2/2] Actually change the executable name and documentation --- README.md | 8 ++++---- ...ng-resolve-conflicts.sh => syncthing-resolve-conflicts | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename syncthing-resolve-conflicts.sh => syncthing-resolve-conflicts (100%) diff --git a/README.md b/README.md index 981387e..3faa682 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ for removal. Non-text files are ignored at the moment and can be removed one by one if desired. - syncthing-resolve-conflicts.sh v1.0.0 + syncthing-resolve-conflicts v1.0.0 Inspired by 'pacdiff'. A simple program to merge or remove sync conflicts. Locate is used to find conflicts. In case the database is not recent, run 'updatedb'. - Usage: syncthing-resolve-conflicts.sh [-o] [--nocolor] + Usage: syncthing-resolve-conflicts [-o] [--nocolor] General Options: -o/--output print files instead of merging them @@ -32,5 +32,5 @@ if desired. Environment Variables: DIFFPROG override the merge program: (default: 'vim -d') - Example: DIFFPROG=meld syncthing-resolve-conflicts.sh - Example: syncthing-resolve-conflicts.sh --output + Example: DIFFPROG=meld syncthing-resolve-conflicts + Example: syncthing-resolve-conflicts --output diff --git a/syncthing-resolve-conflicts.sh b/syncthing-resolve-conflicts similarity index 100% rename from syncthing-resolve-conflicts.sh rename to syncthing-resolve-conflicts