summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-04-06 06:58:03 -0300
committerRenato Botelho <renato@netgate.com>2016-04-06 06:58:17 -0300
commit6d5e5db2cec9399b78ef61ac9488cd87abc9ee1e (patch)
tree6eb56e358fe9b34ef0e6bd41b71d7ae4ff2b5def /src
parentcc1b7ddd0ba2d7eee6ee7ec1cae83efda91427d0 (diff)
downloadpfsense-6d5e5db2cec9399b78ef61ac9488cd87abc9ee1e.zip
pfsense-6d5e5db2cec9399b78ef61ac9488cd87abc9ee1e.tar.gz
Simplify logic
(cherry picked from commit 05bdceee8c8fd598cdf83dc57c4006e20612e26d)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 360d8b0..cc58896 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -736,13 +736,12 @@ if [ -z "${pkg_repo_conf_path}" -o ! -f "${pkg_repo_conf_path}" ]; then
pkg_repo_conf_path=${default_pkg_repo_conf_path}
fi
-if [ -f "${pkg_repo_conf_path}" -a -e "${pkg_repo_conf}" -a \
- ! -L "${pkg_repo_conf}" ]; then
- rm -f ${pkg_repo_conf}
- ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}
-fi
-
if [ -f "${pkg_repo_conf_path}" ]; then
+ if [ -e "${pkg_repo_conf}" -a ! -L "${pkg_repo_conf}" ]; then
+ rm -f ${pkg_repo_conf}
+ ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}
+ fi
+
if [ "$(readlink ${pkg_repo_conf})" != "${pkg_repo_conf_path}" ]; then
mkdir -p /usr/local/etc/pkg/repos
ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}
OpenPOWER on IntegriCloud