mirror of
https://github.com/jarun/nnn.git
synced 2024-11-28 05:41:31 +00:00
Do not update merged file, remove README.md
This commit is contained in:
parent
4f787fd59e
commit
472564fd7f
|
@ -15,7 +15,6 @@ is_cmd_exists () {
|
||||||
|
|
||||||
merge () {
|
merge () {
|
||||||
vimdiff $1 $2
|
vimdiff $1 $2
|
||||||
cp -vRf $1 $2
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt () {
|
prompt () {
|
||||||
|
@ -63,4 +62,4 @@ done
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
||||||
$sucmd mv -vf nnn-master/misc/nlaunch/nlaunch /usr/local/bin/
|
$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
|
||||||
|
|
|
@ -25,8 +25,6 @@ if [ -z "$res" ]; then
|
||||||
read res
|
read res
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ -z "$res" ]; then
|
if ! [ -z "$res" ] && ! [ -z "$minsize" ]; then
|
||||||
if ! [ -z "$minsize" ]; then
|
imgp -ackx "$res" -s "$minsize"
|
||||||
imgp -ackx "$res" -s "$minsize"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue