diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2019-06-13 02:07:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 02:07:03 +0200 |
| commit | 84dfcac54d1c07c18bc8fd3ba61a8fe957c67757 (patch) | |
| tree | b8bdadd60843e5a1e4b5b7f1ed0c7d905f10c393 | |
| parent | a955719f15037eaabb20cd1c8af8bc8d40cadd33 (diff) | |
| parent | 712fa397f860a29e0a38a92ad441e04de0ff93ec (diff) | |
| download | ranger-84dfcac54d1c07c18bc8fd3ba61a8fe957c67757.tar.gz | |
Merge branch 'master' into pr/safe-image-wd
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | ranger/__init__.py | 11 | ||||
| -rw-r--r-- | ranger/core/loader.py | 7 | ||||
| -rwxr-xr-x | ranger/data/scope.sh | 2 |
4 files changed, 19 insertions, 8 deletions
diff --git a/README.md b/README.md index 6ef246a8..be17f0f9 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,13 @@ out which program to use for what file type.  +For `mc` aficionados there's also the multi-pane viewmode. + +<p> +<img src="https://raw.githubusercontent.com/ranger/ranger-assets/master/screenshots/twopane.png" alt="two panes" width="49%" /> +<img src="https://raw.githubusercontent.com/ranger/ranger-assets/master/screenshots/multipane.png" alt="multiple panes" width="49%" /> +</p> + This file describes ranger and how to get it to run. For instructions on the usage, please read the man page (`man ranger` in a terminal). See `HACKING.md` for development-specific information. diff --git a/ranger/__init__.py b/ranger/__init__.py index 2228d40e..fabaeae9 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -21,10 +21,13 @@ def version_helper(): import subprocess version_string = 'ranger-master {0}' try: - git_describe = subprocess.check_output(['git', 'describe'], - universal_newlines=True, - stderr=subprocess.PIPE) - version_string = version_string.format(git_describe.strip('\n')) + git_describe = subprocess.Popen(['git', 'describe'], + universal_newlines=True, + cwd=RANGERDIR, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (git_description, _) = git_describe.communicate() + version_string = version_string.format(git_description.strip('\n')) except (OSError, subprocess.CalledProcessError): version_string = version_string.format(__version__) return version_string diff --git a/ranger/core/loader.py b/ranger/core/loader.py index 96d000ac..26b729b6 100644 --- a/ranger/core/loader.py +++ b/ranger/core/loader.py @@ -101,9 +101,10 @@ class CopyLoader(Loadable, FileManagerAware): # pylint: disable=too-many-instan if path == fobj.path or str(path).startswith(fobj.path): tag = self.fm.tags.tags[path] self.fm.tags.remove(path) - self.fm.tags.tags[ - path.replace(fobj.path, path.join(self.original_path, fobj.basename)) - ] = tag + new_path = path.replace( + fobj.path, + os.path.join(self.original_path, fobj.basename)) + self.fm.tags.tags[new_path] = tag self.fm.tags.dump() n = 0 for n in shutil_g.move(src=fobj.path, dst=self.original_path, diff --git a/ranger/data/scope.sh b/ranger/data/scope.sh index e9c10916..9202146d 100755 --- a/ranger/data/scope.sh +++ b/ranger/data/scope.sh @@ -101,7 +101,7 @@ handle_image() { local mimetype="${1}" case "${mimetype}" in # SVG - # image/svg+xml) + # image/svg+xml|image/svg) # convert -- "${FILE_PATH}" "${IMAGE_CACHE_PATH}" && exit 6 # exit 1;; |