--- NsCDE/bin/getfont.orig 2021-05-02 07:40:22 UTC +++ NsCDE/bin/getfont @@ -12,11 +12,6 @@ export LC_ALL=C PrintFnSize=0 PrettyName=0 -if [ -z $NSCDE_ROOT ]; then - echo "No \$NSCDE_ROOT set. Exiting." - exit 3 -fi - if [ -z $FVWM_USERDIR ]; then echo "No \$FVWM_USERDIR set. Exiting." exit 4 @@ -46,7 +41,7 @@ function GetFont Defaults if [ "x$FnFile" == "x" ]; then - sysfncffile="${NSCDE_ROOT}/config/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" + sysfncffile="${PREFIX}/etc/nscde/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" if [ -s "${FVWM_USERDIR}/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" ]; then fncnffile="${FVWM_USERDIR}/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" avoiddoublegrep=0 @@ -74,7 +69,7 @@ function GetFont Catch2="${Catch/InfoStoreAdd font./}" Catch3="${Catch2#*\"}" - GetSize=$(echo "${Catch3/\"/}" | $NSCDE_ROOT/bin/ised -c "s/\(.*\)\(size=\)\(.*\)\(.*\)\?/\3/g" -o -f -) + GetSize=$(echo "${Catch3/\"/}" | ${PREFIX}/sbin/ised -c "s/\(.*\)\(size=\)\(.*\)\(.*\)\?/\3/g" -o -f -) if (($PrettyName == 1)); then FontStruct=$(echo "${Catch3/\"/}" | awk -F: '{ $1=""; print $0 }' | sed 's/^ //g; s/size=//g') else @@ -126,7 +121,7 @@ function GetFont if (($GetSize > $FnMaxSize)); then if (($PrintFnSize == 0)); then - echo "$FontStruct" | $NSCDE_ROOT/bin/ised -c "s/\(.*\)\(size=\)\([[:digit:]]\+\)\(\.[[:digit:]]\+\)\?\(.*\)\?/\1\2${FnMaxSize}\5/g" -o -f - + echo "$FontStruct" | ${PREFIX}/sbin/ised -c "s/\(.*\)\(size=\)\([[:digit:]]\+\)\(\.[[:digit:]]\+\)\?\(.*\)\?/\1\2${FnMaxSize}\5/g" -o -f - else echo $FnMaxSize fi