]> Sergey Matveev's repositories - nnn.git/commitdiff
Do not update merged file, remove README.md
authorArun Prakash Jana <engineerarun@gmail.com>
Sun, 17 Nov 2019 15:32:43 +0000 (21:02 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Sun, 17 Nov 2019 15:32:43 +0000 (21:02 +0530)
plugins/getplugs
plugins/imgresize

index e6d235f4e75a3dd26dc8eebe5114d8b6c4d29bfe..d27a522f2bbb1e02cef72db9a5122ecf098a352a 100755 (executable)
@@ -15,7 +15,6 @@ is_cmd_exists () {
 
 merge () {
        vimdiff $1 $2
-       cp -vRf $1 $2
 }
 
 prompt () {
@@ -63,4 +62,4 @@ done
 cd ../..
 
 $sucmd mv -vf nnn-master/misc/nlaunch/nlaunch /usr/local/bin/
-rm -rf nnn-master/ master.tar.gz README.md
+rm -rf nnn-master/ master.tar.gz $PLUGIN_DIR/README.md
index 6d016f1d46491b69871c34ef19f418b000d977a9..01917e772f46abc7cf286ebd2cd4a5f4a19f271c 100755 (executable)
@@ -25,8 +25,6 @@ if [ -z "$res" ]; then
     read res
 fi
 
-if ! [ -z "$res" ]; then
-    if ! [ -z "$minsize" ]; then
-        imgp -ackx "$res" -s "$minsize"
-    fi
+if ! [ -z "$res" ] && ! [ -z "$minsize" ]; then
+    imgp -ackx "$res" -s "$minsize"
 fi