DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 04:50:09 +00:00
Code

removed dependence on lsb_release and ensured dpkg-architecture is installed

Browse Source
This commit is contained in:
Stephen Gaito 2020-06-01 16:12:22 +00:00
parent ed2f9db9cb
commit cf48cf54c1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildScripts/buildInstallLocallyApt
View File

@ -10,8 +10,8 @@ export MAKE_PARALLEL="-j $(nproc)"
# choose one of the following... # choose one of the following...
# #
export PDF2HTMLEX_BRANCH=update-poppler # export PDF2HTMLEX_BRANCH=<<yourTagHereNoSpaces>>
# export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
# The following environment variable determines where the poppler, # The following environment variable determines where the poppler,
# poppler-data, fontforge and pdf2htmlEX packages are installed. # poppler-data, fontforge and pdf2htmlEX packages are installed.

7
buildScripts/createDebianPackage
View File

@ -10,7 +10,9 @@ echo "CREATING pdf2htmlEX (binary) Debian package"
echo "-------------------------------------------------------------------" echo "-------------------------------------------------------------------"
echo "" echo ""
export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH-$(lsb_release -cs).deb" source /etc/lsb-release
export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH-$DISTRIB_CODENAME.deb"
echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs
@ -66,7 +68,6 @@ find $DEBDIR -type f | xargs md5sum > $md5sumsFile
# Accumulate the control file information # Accumulate the control file information
# #
versionValue=$(git describe --abbrev=0) versionValue=$(git describe --abbrev=0)
releaseValue=$(lsb_release -cs)
architectureValue=$(dpkg-architecture -q DEB_BUILD_ARCH_CPU) architectureValue=$(dpkg-architecture -q DEB_BUILD_ARCH_CPU)
maintainerValue="$(git config --get user.name) <$(git config --get user.email)>" maintainerValue="$(git config --get user.name) <$(git config --get user.email)>"
@ -74,7 +75,7 @@ maintainerValue="$(git config --get user.name) <$(git config --get user.email)>"
# #
echo "Package: pdf2htmlEX" > $controlFile echo "Package: pdf2htmlEX" > $controlFile
echo "Version: 0:0.$versionValue-0" >> $controlFile echo "Version: 0:0.$versionValue-0" >> $controlFile
echo "Distribution: $releaseValue" >> $controlFile echo "Distribution: $DISTRIB_CODENAME" >> $controlFile
echo "Architecture: $architectureValue" >> $controlFile echo "Architecture: $architectureValue" >> $controlFile
echo "Section: universe/web" >> $controlFile echo "Section: universe/web" >> $controlFile
echo "Priority: optional" >> $controlFile echo "Priority: optional" >> $controlFile

1
buildScripts/getBuildToolsApt
View File

@ -25,6 +25,7 @@ sudo apt-get $UNATTENDED install \
gcc \ gcc \
g++ \ g++ \
dpkg \ dpkg \
dpkg-dev \
gettext \ gettext \
openjdk-8-jre-headless \ openjdk-8-jre-headless \
jq \ jq \