Page MenuHomeFreeBSD
Files F105570058

D721.id1354.diff
No OneTemporary
Actions

D721.id1354.diff
View Options

Index: Keywords/fc.ucl
===================================================================
--- Keywords/fc.ucl
+++ Keywords/fc.ucl
@@ -4,8 +4,16 @@
actions: [dirrmtry]
post-install: <<EOD
- fc-cache -s %D/%@ 2>/dev/null || true
+ case "%@" in
+ /*) fontsdir="%@" ;;
+ *) fontsdir="%D/%@" ;;
+ esac
+ fc-cache -s ${fontsdir} 2>/dev/null || true
EOD
post-deinstall: <<EOD
- fc-cache -s %D/%@ 2>/dev/null || true
+ case "%@" in
+ /*) fontsdir="%@" ;;
+ *) fontsdir="%D/%@" ;;
+ esac
+ fc-cache -s ${fontsdir} 2>/dev/null || true
EOD
Index: Keywords/fcfontsdir.ucl
===================================================================
--- Keywords/fcfontsdir.ucl
+++ Keywords/fcfontsdir.ucl
@@ -4,18 +4,26 @@
actions: [dirrmtry]
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
Index: Keywords/fontsdir.ucl
===================================================================
--- Keywords/fontsdir.ucl
+++ Keywords/fontsdir.ucl
@@ -4,16 +4,24 @@
actions: [dirrmtry]
post-install: <<EOD
- mkfontscale %D/%@ 2>/dev/null || true
- mkfontdir %D/%@ 2>/dev/null || true
+ case "%@" in
+ /*) fontsdir="%@" ;;
+ *) fontsdir="%D/%@" ;;
+ esac
+ mkfontscale ${fontsdir} 2>/dev/null || true
+ mkfontdir ${fontsdir} 2>/dev/null || true
EOD
post-deinstall: <<EOD
- 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
+ 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
Index: Keywords/info.ucl
===================================================================
--- Keywords/info.ucl
+++ Keywords/info.ucl
@@ -4,10 +4,16 @@
actions: [file]
post-install: <<EOD
- file=%D/%@
+ case "%@" in
+ /*) file="%@" ;;
+ *) file="%D/%@" ;;
+ esac
indexinfo ${file%/*}
EOD
post-deinstall: <<EOD
- file=%D/%@
+ case "%@" in
+ /*) file="%@" ;;
+ *) file="%D/%@" ;;
+ esac
indexinfo ${file%/*}
EOD
Index: Keywords/shell.ucl
===================================================================
--- Keywords/shell.ucl
+++ Keywords/shell.ucl
@@ -13,12 +13,20 @@
actions: [file]
post-install: <<EOD
+ case "%@" in
+ /*) file="%@" ;;
+ *) file="%D/%@" ;;
+ esac
cp /etc/shells /etc/shells.bak
- (grep -v %D/%@ /etc/shells.bak; echo %D/%@) > /etc/shells
+ (grep -v ${file} /etc/shells.bak; echo ${file}) > /etc/shells
rm -f /etc/shells.bak
EOD
pre-deinstall: <<EOD
+ case "%@" in
+ /*) file="%@" ;;
+ *) file="%D/%@" ;;
+ esac
cp /etc/shells /etc/shells.bak
- grep -v %D/%@ /etc/shells.bak > /etc/shells
+ grep -v ${file} /etc/shells.bak > /etc/shells
rm -f /etc/shells.bak
EOD

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 18, 7:01 PM (19 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15493608
Default Alt Text
D721.id1354.diff (4 KB)

Event Timeline