diff options
| author | hut <hut@lavabit.com> | 2010-06-18 17:11:54 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-06-18 17:11:54 +0200 |
| commit | b06433bc03632ae0fe74381fa0a474d64b0fee94 (patch) | |
| tree | a77c7cfe816b721b19c3e4d684f63d9f592f61ba | |
| parent | 426e9bb4f5c00756df7f6331f1ab9a9d4278ae8d (diff) | |
| download | ranger-b06433bc03632ae0fe74381fa0a474d64b0fee94.tar.gz | |
Removed built-in support for uninstalling.
Since distutils (setup.py) is used and distutils doesn't support uninstalling, I shouldn't implement my own half-assed, potentially dangerous uninstall script either.
| -rw-r--r-- | INSTALL | 14 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 10 insertions, 13 deletions
diff --git a/INSTALL b/INSTALL index b5b1f066..3f4e0198 100644 --- a/INSTALL +++ b/INSTALL @@ -13,13 +13,11 @@ sudo make install Uninstalling ============ -Ranger uses python distutils to install ranger which does not support automatic -uninstalling. +Again, use your package manager to uninstall ranger. No other way for +automatically removing ranger is supported! -However, after installing ranger with one of the ways above, all installed -files are recorded to "uninstall_info". This information can be used to -remove ranger: -cat uninstall_info | xargs -d "\n" sudo rm -- +However, if you installed ranger with the command above, all installed files +have been recorded to "uninstall_info". This information can be used to remove +ranger by hand, e.g.: -or simply: -sudo make uninstall +cat uninstall_info | xargs -d "\n" sudo rm -- diff --git a/Makefile b/Makefile index 2f2417de..88abe024 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ SNAPSHOT_NAME ?= $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar # Find suitable python version (need python >= 2.6 or 3.1): PYTHON ?= $(shell python -c 'import sys; sys.exit(sys.version < "2.6")' && \ which python || which python3.1 || which python3 || which python2.6) +SETUPOPTS ?= '--record=uninstall_info' DOCDIR ?= doc/pydoc DESTDIR ?= / PYOPTIMIZE ?= 1 @@ -37,6 +38,7 @@ options: help @echo 'DOCDIR = $(DOCDIR)' help: + @echo 'make install: Install $(NAME)' @echo 'make doc: Create the pydoc documentation' @echo 'make clean: Remove the compiled files (*.pyc, *.pyo)' @echo 'make cleandoc: Remove the pydoc documentation' @@ -44,12 +46,9 @@ help: @echo 'make test: Run all unittests.' install: - $(PYTHON) setup.py install --record=uninstall_info \ + $(PYTHON) setup.py install $(SETUPOPTS) \ '--root=$(DESTDIR)' --optimize=$(PYOPTIMIZE) -uninstall: - cd $(DESTDIR) && cat $(CWD)/uninstall_info | xargs -d "\n" rm -- - compile: clean PYTHONOPTIMIZE=$(PYOPTIMIZE) $(PYTHON) -m compileall -q ranger @@ -76,4 +75,4 @@ bm: snapshot: git archive --prefix='$(NAME)-$(VERSION)/' --format=tar HEAD | gzip > $(SNAPSHOT_NAME) -.PHONY: default options compile clean doc cleandoc test bm snapshot install uninstall +.PHONY: default options compile clean doc cleandoc test bm snapshot install |