Merge pull request #60 from apauley/release-tarball-fixes

Release tarball fixes

Author: apauley

ChangeLog.md

@@ -1,5 +1,9 @@
 # Changelog for [hledger-flow](https://github.com/apauley/hledger-flow)
 
+## 0.12.2.1
+
+Fix resolver extraction and hledger-flow --version in release-tarball script
+
 ## 0.12.2
 
 Slightly smarter reporting.

bin/release-tarball

@@ -37,7 +37,7 @@ mkdir -p ${TARGETBASE}
 ABBRHASH="$(git log -1 --format=tformat:%h)"
 PACKAGE_VERSION="$(grep '^version:' ${BASEDIR}/package.yaml|awk '{print $2}')"
 VERSION="v${PACKAGE_VERSION}"
-STACK_RESOLVER="$(grep '^resolver: lts-' ${STACK_YAML}|cut -d' ' -f2)"
+STACK_RESOLVER="$(grep '^resolver:' ${STACK_YAML}|cut -d' ' -f2)"
 GHC_VERSION="$(stack exec -- ghc --version)"
 CLI_NAME="$(basename ${FILE})"
 PLATFORM=`uname -s`
@@ -53,7 +53,7 @@ date > ${BUILDINFO}
 
 echo >> ${BUILDINFO}
 uname -a >> ${BUILDINFO}
-echo -e "\nhledger-flow version: $(${FILE} version)" >> ${BUILDINFO}
+echo -e "\nhledger-flow version: $(${FILE} --version)" >> ${BUILDINFO}
 echo -e "hledger-flow package.yaml version: ${PACKAGE_VERSION}\n" >> ${BUILDINFO}
 echo -e "${STACK_YAML} resolver: ${STACK_RESOLVER}" >> ${BUILDINFO}
 echo -e "GHC Version: ${GHC_VERSION}\n" >> ${BUILDINFO}

package.yaml

@@ -1,5 +1,5 @@
 name:                hledger-flow
-version:             0.12.2.0
+version:             0.12.2.1
 synopsis:            An hledger workflow focusing on automated statement import and classification.
 category:            Finance, Console
 license:             GPL-3