- Accept absolute path for @fc, @fontsdir, @fcfontsdir, @shell keywords

Approved by:	portmgr (antoine, bapt)
Differential Revision:	https://reviews.freebsd.org/D721

1 files changed, 18 insertions, 10 deletions

diff --git a/Keywords/fcfontsdir.ucl b/Keywords/fcfontsdir.ucl
index 578c88ae9d7e..280dd697b09d 100644
--- a/Keywords/fcfontsdir.ucl
+++ b/Keywords/fcfontsdir.ucl
@@ -4,18 +4,26 @@
 
 actions: [dir]
 post-install: <<EOD
-  fc-cache -s %D/%@ 2>/dev/null || true
-  mkfontscale %D/%@ 2>/dev/null || true
-  mkfontdir %D/%@ 2>/dev/null || true
+  case "%@" in
+  /*) fontsdir="%@" ;;
+  *) fontsdir="%D/%@" ;;
+  esac
+  fc-cache -s ${fontsdir} 2>/dev/null || true
+  mkfontscale ${fontsdir} 2>/dev/null || true
+  mkfontdir ${fontsdir} 2>/dev/null || true
 EOD
 post-deinstall: <<EOD
-  fc-cache -s %D/%@ 2>/dev/null || true
-  mkfontscale %D/%@ 2>/dev/null || true
-  if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then
-    rm %D/%@/fonts.scale
+  case "%@" in
+  /*) fontsdir="%@" ;;
+  *) fontsdir="%D/%@" ;;
+  esac
+  fc-cache -s ${fontsdir} 2>/dev/null || true
+  mkfontscale ${fontsdir} 2>/dev/null || true
+  if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
+    rm ${fontsdir}/fonts.scale
   fi
-  mkfontdir %D/%@ 2>/dev/null || true
-  if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then
-    rm %D/%@/fonts.dir
+  mkfontdir ${fontsdir} 2>/dev/null || true
+  if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then
+    rm ${fontsdir}/fonts.dir
   fi
 EOD