mirror of
https://github.com/limosek/zaf.git
synced 2024-11-14 14:39:06 +01:00
Merged plugin installation changes from trunk
This commit is contained in:
parent
b003e4f29f
commit
d823a3665a
@ -216,8 +216,8 @@ zaf_ctrl_install() {
|
||||
done
|
||||
files=$(zaf_ctrl_get_global_option $2 "Install-files")
|
||||
for f in $files; do
|
||||
zaf_fetch_url "$1/$b" >"${ZAF_TMP_DIR}/$b"
|
||||
zaf_install "${ZAF_TMP_DIR}/$b" "$pdir"
|
||||
zaf_fetch_url "$1/$f" >"${ZAF_TMP_DIR}/$f"
|
||||
zaf_install "${ZAF_TMP_DIR}/$f" "$pdir"
|
||||
done
|
||||
true
|
||||
) || zaf_err "Error during zaf_ctrl_install"
|
||||
@ -245,6 +245,7 @@ zaf_ctrl_generate_items_cfg() {
|
||||
(set -e
|
||||
for i in $items; do
|
||||
iscript=$(zaf_stripctrl $i)
|
||||
zafparams=""
|
||||
zaf_ctrl_get_item_option $1 $i "Parameters" >$tmpfile
|
||||
if [ -s "$tmpfile" ]; then
|
||||
ikey="$2.$i[*]"
|
||||
|
@ -81,7 +81,7 @@ zaf_prepare_plugin() {
|
||||
url=$(zaf_get_plugin_url "$1")/control.zaf || exit $?
|
||||
plugindir="$2"
|
||||
control=${plugindir}/control.zaf
|
||||
if [ "$(zaf_url_info $1)" = "path" ] && cmp -s "$url" "$control"; then
|
||||
if [ "$(zaf_url_info $1)" = "path" ] && [ "$url" = "$control" ]; then
|
||||
zaf_err "prepare_plugin: Cannot install from itself!"
|
||||
fi
|
||||
zaf_install_dir "$plugindir"
|
||||
|
Loading…
Reference in New Issue
Block a user