From 6d5e5db2cec9399b78ef61ac9488cd87abc9ee1e Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Wed, 6 Apr 2016 06:58:03 -0300
Subject: [PATCH] Simplify logic

(cherry picked from commit 05bdceee8c8fd598cdf83dc57c4006e20612e26d)
---
 src/usr/local/sbin/pfSense-upgrade | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 360d8b0df3..cc58896eb7 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}