Project

General

Profile

« Previous | Next » 

Revision 6d5e5db2

Added by Renato Botelho over 9 years ago

Simplify logic

(cherry picked from commit 05bdceee8c8fd598cdf83dc57c4006e20612e26d)

View differences:

src/usr/local/sbin/pfSense-upgrade
736 736
	pkg_repo_conf_path=${default_pkg_repo_conf_path}
737 737
fi
738 738

  
739
if [ -f "${pkg_repo_conf_path}" -a -e "${pkg_repo_conf}" -a \
740
    ! -L "${pkg_repo_conf}" ]; then
741
	rm -f ${pkg_repo_conf}
742
	ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}
743
fi
744

  
745 739
if [ -f "${pkg_repo_conf_path}" ]; then
740
	if [ -e "${pkg_repo_conf}" -a ! -L "${pkg_repo_conf}" ]; then
741
		rm -f ${pkg_repo_conf}
742
		ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}
743
	fi
744

  
746 745
	if [ "$(readlink ${pkg_repo_conf})" != "${pkg_repo_conf_path}" ]; then
747 746
		mkdir -p /usr/local/etc/pkg/repos
748 747
		ln -sf ${pkg_repo_conf_path} ${pkg_repo_conf}

Also available in: Unified diff