Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 356467 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +16 lines)
Line  Link Here
0
-- eselect-php-0.6.2
0
++ eselect-php-0.6.2
Lines 17-23 Link Here
17
}
17
}
18
18
19
find_targets() {
19
find_targets() {
20
	for dir in $(get_libdir)/php*.*; do
20
	for dir in "${EPREFIX}"$(get_libdir)/php*.*; do
21
		t=$(basename $dir)
21
		t=$(basename $dir)
22
		has $t $dirs || dirs="${dirs} $t"
22
		has $t $dirs || dirs="${dirs} $t"
23
	done
23
	done
Lines 26-67 Link Here
26
26
27
find_targets_apache2() {
27
find_targets_apache2() {
28
	for target in $(find_targets); do
28
	for target in $(find_targets); do
29
		[[ -f $(get_libdir)/$target/apache2/libphp5.so ]] && echo $target
29
		[[ -f ${EPREFIX}$(get_libdir)/$target/apache2/libphp5.so ]] && echo $target
30
	done
30
	done
31
}
31
}
32
32
33
find_targets_cli() {
33
find_targets_cli() {
34
	for target in $(find_targets); do
34
	for target in $(find_targets); do
35
		[[ -f $(get_libdir)/$target/bin/php ]] && echo $target
35
		[[ -f ${EPREFIX}$(get_libdir)/$target/bin/php ]] && echo $target
36
	done
36
	done
37
}
37
}
38
38
39
find_targets_fpm() {
39
find_targets_fpm() {
40
	for target in $(find_targets); do
40
	for target in $(find_targets); do
41
		[[ -f $(get_libdir)/$target/bin/php-fpm ]] && echo $target
41
		[[ -f ${EPREFIX}$(get_libdir)/$target/bin/php-fpm ]] && echo $target
42
	done
42
	done
43
}
43
}
44
44
45
find_targets_cgi() {
45
find_targets_cgi() {
46
	for target in $(find_targets); do
46
	for target in $(find_targets); do
47
		[[ -f $(get_libdir)/$target/bin/php-cgi ]] && echo $target
47
		[[ -f ${EPREFIX}$(get_libdir)/$target/bin/php-cgi ]] && echo $target
48
	done
48
	done
49
}
49
}
50
50
51
get_active_cli() {
51
get_active_cli() {
52
	readlink -e /usr/bin/php | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9][0-9]*\)/bin/php:\1:p"
52
	readlink -e "${EPREFIX}"/usr/bin/php | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9][0-9]*\)/bin/php:\1:p"
53
}
53
}
54
54
55
get_active_cgi() {
55
get_active_cgi() {
56
	readlink -e /usr/bin/php-cgi | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/bin/php-cgi:\1:p"
56
	readlink -e "${EPREFIX}"/usr/bin/php-cgi | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/bin/php-cgi:\1:p"
57
}
57
}
58
58
59
get_active_fpm() {
59
get_active_fpm() {
60
	readlink -e /usr/bin/php-fpm | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/bin/php-fpm:\1:p"
60
	readlink -e "${EPREFIX}"/usr/bin/php-fpm | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/bin/php-fpm:\1:p"
61
}
61
}
62
62
63
get_active_apache2() {
63
get_active_apache2() {
64
	readlink -e $(get_libdir)/apache2/modules/libphp5.so | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/apache2/libphp5.so:\1:p"
64
	readlink -e "${EPREFIX}"$(get_libdir)/apache2/modules/libphp5.so | sed -ne "s:$(get_libdir)/\(php[0-9]\.[0-9]\)/apache2/libphp5.so:\1:p"
65
}
65
}
66
66
67
resolv_target() {
67
resolv_target() {
Lines 127-135 Link Here
127
set_apache2() {
127
set_apache2() {
128
	local t=$(resolv_target apache2 $1)
128
	local t=$(resolv_target apache2 $1)
129
	[[ -z $t ]] && die -q "Bad target"
129
	[[ -z $t ]] && die -q "Bad target"
130
	ln -sf $(get_libdir)/$t/apache2/libphp5.so $(get_libdir)/apache2/modules/ || \
130
	ln -sf "${EPREFIX}"$(get_libdir)/$t/apache2/libphp5.so "${EPREFIX}"$(get_libdir)/apache2/modules/ || \
131
	  die -q "Failed to set symlink for libphp5.so"
131
	  die -q "Failed to set symlink for libphp5.so"
132
	echo "You have to run \`/etc/init.d/apache2 restart' for the changes to take effect"
132
	echo "You have to run \`${EPREFIX}/etc/init.d/apache2 restart' for the changes to take effect"
133
}
133
}
134
134
135
set_cli() {
135
set_cli() {
Lines 137-143 Link Here
137
	[[ -z $t ]] && die -q "Bad target"
137
	[[ -z $t ]] && die -q "Bad target"
138
	local file
138
	local file
139
	for file in php phpize php-config; do
139
	for file in php phpize php-config; do
140
		ln -sf $(get_libdir)/$t/bin/$file /usr/bin/$file || \
140
		ln -sf "${EPREFIX}"$(get_libdir)/$t/bin/$file "${EPREFIX}"/usr/bin/$file || \
141
		  die -q "Failed to create symlink for ${file}"
141
		  die -q "Failed to create symlink for ${file}"
142
	done
142
	done
143
}
143
}
Lines 146-161 Link Here
146
	t=$(resolv_target cgi $1)
146
	t=$(resolv_target cgi $1)
147
	[[ -z $t ]] && die -q "Bad target"
147
	[[ -z $t ]] && die -q "Bad target"
148
	local file
148
	local file
149
	ln -sf $(get_libdir)/$t/bin/php-cgi /usr/bin/php-cgi || \
149
	ln -sf "${EPREFIX}"$(get_libdir)/$t/bin/php-cgi "${EPREFIX}"/usr/bin/php-cgi || \
150
	  die -q "Failed to create symlink for php-cgi"
150
	  die -q "Failed to create symlink for php-cgi"
151
}
151
}
152
152
153
set_fpm() {
153
set_fpm() {
154
	local t=$(resolv_target fpm $1)
154
	local t=$(resolv_target fpm $1)
155
	[[ -z $t ]] && die -q "Bad target"
155
	[[ -z $t ]] && die -q "Bad target"
156
	ln -sf $(get_libdir)/$t/bin/php-fpm /usr/bin/php-fpm || \
156
	ln -sf "${EPREFIX}"$(get_libdir)/$t/bin/php-fpm "${EPREFIX}"/usr/bin/php-fpm || \
157
	  die -q "Failed to create symlink for the php-fpm binary"
157
	  die -q "Failed to create symlink for the php-fpm binary"
158
	echo "You have to run \`/etc/init.d/php-fpm restart' for the changes to take effect"
158
	echo "You have to run \`${EPREFIX}/etc/init.d/php-fpm restart' for the changes to take effect"
159
}
159
}
160
## set action
160
## set action
161
161

Return to bug 356467