Merge branch 'master' of pumpkin.lan:Mike/Projects/voice2json

synesthesiam · Jun 3, 2021 · 55e56bc · 55e56bc
2 parents 26abc9f + 2c493cc
commit 55e56bc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -55,6 +55,7 @@ COPY --from=build ${APP_DIR}/ ${APP_DIR}/
 COPY --from=build /build/voice2json.sh ${APP_DIR}/
 
 COPY etc/profile.defaults.yml ${APP_DIR}/etc/
+COPY etc/profiles/ ${APP_DIR}/etc/profiles/
 COPY etc/precise/ ${APP_DIR}/etc/precise/
 COPY site/ ${APP_DIR}/site/
 COPY bin/voice2json ${APP_DIR}/bin/

diff --git a/Dockerfile.debian b/Dockerfile.debian
@@ -63,6 +63,7 @@ RUN cd ${BUILD_DIR} && \
 COPY scripts/install/ ${BUILD_DIR}/scripts/install/
 
 COPY etc/profile.defaults.yml ${BUILD_DIR}/etc/
+COPY etc/profiles/ ${BUILD_DIR}/etc/profiles/
 COPY etc/precise/ ${BUILD_DIR}/etc/precise/
 COPY site/ ${BUILD_DIR}/site/
 

diff --git a/Makefile.in b/Makefile.in
@@ -137,6 +137,7 @@ install-voice2json:
 ifneq ($(IN_PLACE),yes)
 	install -D "$(srcdir)/voice2json.sh" "$(DESTDIR)$(prefix)/bin/voice2json"
 	install -D "--target-directory=$(DESTDIR)$(prefix)/share/voice2json/etc" "$(srcdir)/etc/profile.defaults.yml"
+	install -D "--target-directory=$(DESTDIR)$(prefix)/share/voice2json/etc/profiles" "$(srcdir)/etc/profiles/"*
 	install -D "--target-directory=$(DESTDIR)$(prefix)/share/voice2json/etc/precise" "$(srcdir)/etc/precise"/*
 	install -D "--target-directory=$(DESTDIR)$(prefix)/share/voice2json" VERSION README.md LICENSE
 	if [[ -d "$(srcdir)/site" ]]; then cp -fR "$(srcdir)/site" "$(DESTDIR)$(prefix)/share/voice2json/"; fi || true

diff --git a/debian/voice2json b/debian/voice2json
@@ -4,7 +4,7 @@ APPDIR='/usr/lib/voice2json'
 export PATH="${APPDIR}/bin:${APPDIR}/usr/local/bin:${PATH}"
 export LD_LIBRARY_PATH="${APPDIR}/lib:${APPDIR}/usr/local/lib:${LD_LIBRARY_PATH}"
 
-export voice2json_dir="${APPDIR}"
+export voice2json_dir="${APPDIR}/share/voice2json"
 export KALDI_DIR="${APPDIR}/lib/kaldi"
 
 export PYTHONPATH="${voice2json_dir}:${PYTHONPATH}"

diff --git a/scripts/build-debian.sh b/scripts/build-debian.sh
@@ -15,7 +15,7 @@ this_dir="$( cd "$( dirname "$0" )" && pwd )"
 src_dir="$(realpath "${this_dir}/..")"
 
 version="$(cat "${src_dir}/VERSION")"
-out_version='2.0'
+out_version='2.1'
 
 # -----------------------------------------------------------------------------