Merge pull request #200 from rackerlabs/development

Release 2.0.1

CHANGELOG.md

@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] -
 
+## [2.0.1] - 2018-02-05
+- Fix bug related to DESTDIR included in recap script [(#195)][195] [(#198)][198].
+
 ## [2.0.0] - 2018-01-22
 - Add plugin support [(#155)][155].
   - Split recap functionality between core functions and plugins.
@@ -207,6 +210,8 @@ All notable changes to this project will be documented in this file.
 [170]: https://github.com/rackerlabs/recap/issues/170
 [174]: https://github.com/rackerlabs/recap/issues/174
 [175]: https://github.com/rackerlabs/recap/issues/175
+[195]: https://github.com/rackerlabs/recap/issues/195
+[198]: https://github.com/rackerlabs/recap/issues/198
 
 <!---
 # One-liners to help generate content for CHANGELOG.md

Makefile

@@ -69,7 +69,7 @@ uninstall: uninstall-base uninstall-man uninstall-doc uninstall-$(type)
 
 install-base:
 	@echo "Installing scripts..."
-	@sed -i.orig 's|^\s*\(declare\s\+-r\s\+LIBDIR=\).*$$|\1"$(DESTDIR)$(LIBDIR)/recap"|' src/recap
+	@sed -i.orig 's|^\s*\(declare\s\+-r\s\+LIBDIR=\).*$$|\1"$(LIBDIR)/recap"|' src/recap
 	@install -Dm0755 src/recap $(DESTDIR)$(BINDIR)/recap
 	@install -Dm0755 src/recaplog $(DESTDIR)$(BINDIR)/recaplog
 	@install -Dm0755 src/recaptool $(DESTDIR)$(BINDIR)/recaptool

src/recap

@@ -26,7 +26,7 @@
 #~
 
 ## Version
-declare -r _VERSION='2.0.0'
+declare -r _VERSION='2.0.1'
 
 ## Default settings(can *NOT* be overridden in config file)
 declare -r DATE=$( date +%F_%T )

src/recaplog

@@ -29,7 +29,7 @@
 #~
 
 ## Version
-declare -r _VERSION='2.0.0'
+declare -r _VERSION='2.0.1'
 
 ## Default settings
 PATH=/bin:/usr/bin:/sbin:/usr/sbin

src/recaptool

@@ -31,7 +31,7 @@
 #~
 
 ## Version
-declare -r _VERSION='2.0.0'
+declare -r _VERSION='2.0.1'
 
 ## Default settings
 BASEDIR="/var/log/recap"