summaryrefslogtreecommitdiff
path: root/wm/windowmaker/patches/patch-ag
blob: 49de53ea73292c83f45bf0dfec19d6bbb1f777b1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
$NetBSD: patch-ag,v 1.1 2001/07/15 08:48:01 jlam Exp $

--- util/wsetfont.orig	Mon Feb 19 20:28:11 2001
+++ util/wsetfont
@@ -115,7 +115,7 @@
 
 for i in $DomainNames; do
     tmp="Domain$i"
-    AllKeys="$AllKeys ${!tmp}"
+    eval AllKeys="\"$AllKeys \$${tmp}\""
 done
 
 #
@@ -212,8 +212,9 @@
 	family="default"
     else
 	for i in $all_codings; do
-	    for j in ${!i}; do
-		if [ "$j" == "${locale%_*}" ]; then
+	    eval _i="\$$i"
+	    for j in ${_i}; do
+		if [ "$j" = "${locale%_*}" ]; then
 		    family="$i"
 		    break 2
 		fi
@@ -227,7 +228,7 @@
 #
 is_supported=""
 for i in $Supported; do
-    if test "$family" == "$i"; then
+    if test "$family" = "$i"; then
 	is_supported="YES"
 	break
     fi
@@ -245,7 +246,7 @@
 #
 is_nodef_unable=""
 for i in $NodefUnable; do
-    if test "$family" == "$i"; then
+    if test "$family" = "$i"; then
 	if test -n "$nodef"; then	# --nodef with one from $NodefUnable
 	    echo -e "\n"\
 		"Sorry, --nodef argument is not allowed for these font codings:\n"\
@@ -268,22 +269,22 @@
     for i in $AllKeys; do
 	if test -n "$is_nodef_unable"; then		# japanese,... defaults
 	    tmp="$family$i"
-	    eval $i=${!tmp}
+	    eval $i="\$${tmp}"
 	else						# rest, load defaults
 	    not_font=""
 	    for j in $NotFont; do
-		if test "$i" == "$j"; then
+		if test "$i" = "$j"; then
 		    not_font="YES"
 		    break
 		fi
 	    done
 	    if test -n "$not_font"; then  # don't append coding (not default!)
 		tmp="${family}$i"
-		eval $i="${!tmp}"
+		eval $i="\$${tmp}"
 	    else					# append coding
 		tmp="Default$i"
 		tmp1="${family}Coding"
-		eval $i="${!tmp}${!tmp1}"
+		eval $i="\$${tmp}\$${tmp1}"
 	    fi
 	fi
     done
@@ -305,36 +306,36 @@
     echo
     echo "Setting up $i domain file..."
     tmp="Domain$i"
-    for j in ${!tmp}; do
+    eval _tmp="\$${tmp}"
+    for j in ${_tmp}; do
 	if test -n "$nodef"; then		# --nodef, change coding only
 	    not_font=""
 	    for k in $NotFont; do
-		if test "$k" == "$j"; then
+		if test "$k" = "$j"; then
 		    not_font="YES"
 		    break;
 		fi
 	    done
 	    if test -n "$not_font"; then		# don't append coding
 		tmp1="${family}$j"
-		eval $j=${!tmp1}
+		eval $j="\$${tmp1}"
 	    else					# append coding
 #TODO:make this funny sed script a lot smarter to let us make changes in font
 #     lists, etc... (then we can enable --nodef for NodefUnable codings)
 #TODO:better (or at least any) check, whether wmaker is installed...
 		tmp1="${family}Coding"
-		eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${!tmp1}/g")
-		if test -z "${!j}"; then		# failed, load default
+		eval _tmp1="\$${tmp1}"
+		eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${_tmp1}/g")
+		eval _j="\$$j"
+		if test -z "${_j}"; then		# failed, load default
 		    tmp2="Default$j"
-		    eval $j=${!tmp2}
+		    eval $j="\$${tmp2}"
 		fi
 	    fi
 	fi
-	tmp1="$j=\"${!j}\""			# cosmetic length workaround
-	if (( ${#tmp1} > 80 )); then
-	    tmp1=$(echo "${tmp1:0:76}...\"")
-	fi
-	echo "$tmp1"
-	$WDWRITE $i $j \"${!j}\"
+	eval _j="\$$j"
+	echo $j="${_j}"
+	$WDWRITE $i $j \"${_j}\"
     done
 done
 echo