diff --git a/.gitignore b/.gitignore index fb14b58..d2f4091 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +fontforge* +FontForge* poppler* build compile_commands.json diff --git a/buildScripts/getFontforge b/buildScripts/getFontforge index d1094f7..90caf9d 100755 --- a/buildScripts/getFontforge +++ b/buildScripts/getFontforge @@ -2,7 +2,22 @@ # This bash script gets and unpacks the latest fontforge AppImage -sudo add-apt-repository ppa:fontforge/fontforge -sudo apt-get update -sudo apt-get install libfontforge-dev +# The ppa is "rather old" ;-( +#sudo add-apt-repository ppa:fontforge/fontforge +#sudo apt-get update +#sudo apt-get install libfontforge-dev + +source buildScripts/versionEnvs + +rm -rf $FONTFORGE_APPIMAGE +rm -rf squashfs-root +rm -rf fontforge + +wget https://github.com/fontforge/fontforge/releases/download/$FONTFORGE_VERSION/$FONTFORGE_APPIMAGE + +chmod a+x $FONTFORGE_APPIMAGE + +./$FONTFORGE_APPIMAGE --appimage-extract + +mv squashfs-root fontforge diff --git a/buildScripts/getPoppler b/buildScripts/getPoppler index 1fce35d..ce9474f 100755 --- a/buildScripts/getPoppler +++ b/buildScripts/getPoppler @@ -7,6 +7,7 @@ source buildScripts/versionEnvs echo "Getting poppler version: $POPPLER_VERSION" rm -rf $POPPLER_VERSION.tar.xz +rm -rf poppler wget https://poppler.freedesktop.org/$POPPLER_VERSION.tar.xz diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs index 4a97bb0..e53354a 100644 --- a/buildScripts/versionEnvs +++ b/buildScripts/versionEnvs @@ -6,4 +6,4 @@ export POPPLER_VERSION=poppler-0.82.0 export FONTFORGE_VERSION=20190801 -export FONTFORGE_APPIMAGE=https://github.com/fontforge/fontforge/releases/download/20190801/FontForge-2019-08-01-ac635b8-x86_64.AppImage +export FONTFORGE_APPIMAGE=FontForge-2019-08-01-ac635b8-x86_64.AppImage