diff options
| -rw-r--r-- | ranger/config/commands.py | 4 | ||||
| -rw-r--r-- | ranger/config/rc.conf | 6 | ||||
| -rw-r--r-- | ranger/core/runner.py | 2 | ||||
| -rwxr-xr-x | ranger/data/scope.sh | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py index acc98457..9f0481ce 100644 --- a/ranger/config/commands.py +++ b/ranger/config/commands.py @@ -651,6 +651,8 @@ class touch(Command): Creates a file with the name <fname>. """ + resolve_macros = False + def execute(self): from os.path import join, expanduser, lexists @@ -726,6 +728,8 @@ class rename(Command): Changes the name of the currently highlighted file to <newname> """ + resolve_macros = False + def execute(self): from ranger.container.file import File from os import access diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf index bb9af151..b2965cdc 100644 --- a/ranger/config/rc.conf +++ b/ranger/config/rc.conf @@ -330,9 +330,9 @@ map g? cd /usr/share/doc/ranger map E edit map du shell -p du --max-depth=1 -h --apparent-size map dU shell -p du --max-depth=1 -h --apparent-size | sort -rh -map yp shell -f echo -n %d/%f | xsel -i; xsel -o | xsel -i -b -map yd shell -f echo -n %d | xsel -i; xsel -o | xsel -i -b -map yn shell -f echo -n %f | xsel -i; xsel -o | xsel -i -b +map yp shell -f echo -n %%d/%%f | xsel -i; xsel -o | xsel -i -b +map yd shell -f echo -n %%d | xsel -i; xsel -o | xsel -i -b +map yn shell -f echo -n %%f | xsel -i; xsel -o | xsel -i -b # Filesystem Operations map = chmod diff --git a/ranger/core/runner.py b/ranger/core/runner.py index 0e5d9fa3..0ae227a6 100644 --- a/ranger/core/runner.py +++ b/ranger/core/runner.py @@ -146,7 +146,7 @@ class Runner(object): # Set default shell for Popen if popen_kws['shell']: # This doesn't work with fish, see #300 - if os.environ['SHELL'] != 'fish': + if not 'fish' in os.environ['SHELL']: popen_kws['executable'] = os.environ['SHELL'] if 'stdout' not in popen_kws: diff --git a/ranger/data/scope.sh b/ranger/data/scope.sh index ce9ee574..3611c961 100755 --- a/ranger/data/scope.sh +++ b/ranger/data/scope.sh @@ -28,7 +28,7 @@ maxln=200 # Stop after $maxln lines. Can be used like ls | head -n $maxln # Find out something about the file: mimetype=$(file --mime-type -Lb "$path") -extension=$(/bin/echo -E "${path##*.}" | tr "[:upper:]" "[:lower:]") +extension=$(/bin/echo "${path##*.}" | tr "[:upper:]" "[:lower:]") # Functions: # runs a command and saves its output into $output. Useful if you need @@ -36,7 +36,7 @@ extension=$(/bin/echo -E "${path##*.}" | tr "[:upper:]" "[:lower:]") try() { output=$(eval '"$@"'); } # writes the output of the previously used "try" command -dump() { /bin/echo -E "$output"; } +dump() { /bin/echo "$output"; } # a common post-processing function used after most commands trim() { head -n "$maxln"; } |