From 1b7d29629d8e77b6ae4355acfc30342b03f61fc9 Mon Sep 17 00:00:00 2001 From: leo-arch Date: Sun, 22 Dec 2024 13:14:01 -0300 Subject: [PATCH] Update main config file (cpCmd and mvCmd description) --- misc/clifmrc | 17 +++++++++++------ src/config.c | 12 +++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/misc/clifmrc b/misc/clifmrc index f06eecbe..ea43f6a4 100644 --- a/misc/clifmrc +++ b/misc/clifmrc @@ -353,16 +353,21 @@ ;rmForce=false # Set the default copy command. Available options are: -# 0 = 'cp -iRp', 1 = 'cp -Rp', 2 = 'advcp -giRp', 3 = 'advcp -gRp', -# 4 = 'wcp', and 5 = 'rsync -avP' -# 2-5 include a progress bar. -# Only 0 and 2 will prompt before overwrite. +# 0: 'cp -Rp' +# 1: 'cp -Rp' (force: do not prompt before overwrite) +# 2: 'advcp -gRp' +# 3: 'advcp -gRp' (force) +# 4: 'wcp' +# 5: 'rsync -avP' +# Note: 2-5 include a progress bar. ;cpCmd=0 # Set the default move command. Available options are: -# 0 = 'mv -i', 1 = 'mv', 2 = 'advmv -gi', and 3 = 'advmv -g' +# 0: 'mv' +# 1: 'mv' (force: do not prompt before overwrite) +# 2: 'advmv -g' +# 3: 'advmv -g' (force) # 2 and 3 include a progress bar. -# Only 0 and 2 will prompt before overwrite. ;mvCmd=0 # A command separated line of fields defining default answers for diff --git a/src/config.c b/src/config.c index 1a59b1d6..7700794d 100644 --- a/src/config.c +++ b/src/config.c @@ -1592,16 +1592,14 @@ create_main_config_file(char *file) ;Filter=""\n\n" "# Set the default copy command. Available options are:\n\ -# 0 = 'cp -iRp', 1 = 'cp -Rp', 2 = 'advcp -giRp', 3 = 'advcp -gRp',\n\ -# 4 = 'wcp', and 5 = 'rsync -avP'\n\ -# 2-5 include a progress bar\n\ -# Only 0 and 2 will prompt before overwrite\n\ +# 0: 'cp -Rp', 1: 'cp -Rp' (force), 2: 'advcp -gRp', 3: 'advcp -gRp' (force),\n\ +# 4: 'wcp', and 5: 'rsync -avP'\n\ +# Note: 2-5 include a progress bar\n\ ;cpCmd=%d\n\n" "# Set the default move command. Available options are:\n\ -# 0 = 'mv -i', 1 = 'mv', 2 = 'advmv -gi', and 3 = 'advmv -g'\n\ -# 2 and 3 include a progress bar\n\ -# Only 0 and 2 will prompt before overwrite\n\ +# 0: 'mv', 1: 'mv' (force), 2: 'advmv -g', and 3: 'advmv -g' (force)\n\ +# Note: 2 and 3 include a progress bar\n\ ;mvCmd=%d\n\n" "# If set to true, the 'r' command will never prompt before removals.\n\