Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'github/master'

  • Loading branch information...
commit ada00862d7d75da594ed4fb27cf104bdf39c32b2 2 parents 9682ce7 + e41fb0e
Nico Schottelius authored
6 conf/type/__package_pkg_freebsd/explorer/pkg_version
View
@@ -30,6 +30,10 @@ fi
# Don't produce "no pkgs installed" output -- breaks things
PKG_OUTPUT=$(pkg_info 2>&1)
if [ ! "$PKG_OUTPUT" = "pkg_info: no packages installed" ]; then
- echo "$(echo "$PKG_OUTPUT" | grep "^$name-" | cut '-d ' -f1 | sed "s/$name-//g")"
+ echo -n "$(echo "$PKG_OUTPUT" \
+ | awk '{print $1}' \
+ | sed 's/^\(.*\)-\([^-]*\)$/name:\1 ver:\2/g' \
+ | grep "name:$name ver:" \
+ | sed 's/^.*ver:\(.*\)/\1/g')"
fi
2  conf/type/__package_pkg_freebsd/gencode-remote
View
@@ -107,7 +107,7 @@ if [ -n "$curr_version" ]; then # PKG *is* installed
assert "! ${version} = ${curr_version}" $LINENO
cmd="${rm_cmd} ${name}-${curr_version}"
execcmd "remove" "${cmd}"
- cmd="${add_cmd} ${name}-${version}"
+ cmd="${add_cmd} -r ${name}-${version}"
execcmd "add" "${cmd}"
fi
else # Don't care what version to use
Please sign in to comment.
Something went wrong with that request. Please try again.