From a9a16bf5e3b57f9165c90d2304028d794e4cd913 Mon Sep 17 00:00:00 2001 From: Key4ce Date: Tue, 14 Oct 2014 23:55:17 +0200 Subject: [PATCH 1/5] revert fddbc67 , bsdinstaller doesn't get installer later on. --- scripts/build/build_installer_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build_installer_packages.sh b/scripts/build/build_installer_packages.sh index 79bf4c4..c591ee6 100755 --- a/scripts/build/build_installer_packages.sh +++ b/scripts/build/build_installer_packages.sh @@ -67,7 +67,7 @@ rebuild_port() chmod -R 777 work && \ make -DBATCH options_UNSET="${options_UNSET}" options_SET="${options_SET}" $WITH_NLS_DEF $WITH_CURSES_DEF $WITH_CGI_DEF $WITH_QT_DEF \ $WITH_LUA_BACKEND_DEF $WITH_C_BACKEND_DEF $WITH_DEBUG_DEF \ - $PORTS_FLAGS package FORCE_PKG_REGISTER=yes && \ + $PORTS_FLAGS build package deinstall install FORCE_PKG_REGISTER=yes && \ make clean && rm -rf work } From 9ebe6139d5dfeff6e76ee9e7162ec876ab2ee04d Mon Sep 17 00:00:00 2001 From: Key4ce Date: Tue, 14 Oct 2014 23:56:36 +0200 Subject: [PATCH 2/5] fixes "[: -lt: unexpected operator" on freebsd 10+ --- scripts/build/build_installer_packages.sh | 40 ++++++++++++++--------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/scripts/build/build_installer_packages.sh b/scripts/build/build_installer_packages.sh index c591ee6..43e8886 100755 --- a/scripts/build/build_installer_packages.sh +++ b/scripts/build/build_installer_packages.sh @@ -71,22 +71,32 @@ rebuild_port() make clean && rm -rf work } -if [ $FREEBSD_VERSION -lt 9 ]; then - su root -c \ - "pkg_delete -f 'libaura-*' - pkg_delete -f 'libinstaller-*' - pkg_delete -f '*dfui*' - pkg_delete -f 'thttpd-notimeout-*' - pkg_delete -f 'lua50-*' - pkg_delete -f 'bsdinstaller-*'" +if [ -z $FREEBSD_VERSION ]; then + su root -c \ + "pkg delete -yf 'libaura-*' + pkg delete -yf 'libinstaller-*' + pkg delete -yf '*dfui*' + pkg delete -yf 'thttpd-notimeout-*' + pkg delete -yf 'lua50-*' + pkg delete -yf 'bsdinstaller-*'" else - su root -c \ - "pkg delete -yf 'libaura-*' - pkg delete -yf 'libinstaller-*' - pkg delete -yf '*dfui*' - pkg delete -yf 'thttpd-notimeout-*' - pkg delete -yf 'lua50-*' - pkg delete -yf 'bsdinstaller-*'" + if [ $FREEBSD_VERSION -lt 9 ]; then + su root -c \ + "pkg_delete -f 'libaura-*' + pkg_delete -f 'libinstaller-*' + pkg_delete -f '*dfui*' + pkg_delete -f 'thttpd-notimeout-*' + pkg_delete -f 'lua50-*' + pkg_delete -f 'bsdinstaller-*'" + else + su root -c \ + "pkg delete -yf 'libaura-*' + pkg delete -yf 'libinstaller-*' + pkg delete -yf '*dfui*' + pkg delete -yf 'thttpd-notimeout-*' + pkg delete -yf 'lua50-*' + pkg delete -yf 'bsdinstaller-*'" + fi fi if [ "X$REMOVEOLDPKGS" = "XYES" ]; then From 29c3539a1968776e91e5bd5ad773b3b011aa68a7 Mon Sep 17 00:00:00 2001 From: Key4ce Date: Wed, 15 Oct 2014 01:12:34 +0200 Subject: [PATCH 3/5] Simplify 9ebe613 --- scripts/build/build_installer_packages.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/build/build_installer_packages.sh b/scripts/build/build_installer_packages.sh index 43e8886..e6816f2 100755 --- a/scripts/build/build_installer_packages.sh +++ b/scripts/build/build_installer_packages.sh @@ -71,16 +71,7 @@ rebuild_port() make clean && rm -rf work } -if [ -z $FREEBSD_VERSION ]; then - su root -c \ - "pkg delete -yf 'libaura-*' - pkg delete -yf 'libinstaller-*' - pkg delete -yf '*dfui*' - pkg delete -yf 'thttpd-notimeout-*' - pkg delete -yf 'lua50-*' - pkg delete -yf 'bsdinstaller-*'" -else - if [ $FREEBSD_VERSION -lt 9 ]; then +if [ -n "${FREEBSD_VERSION}" -a "${FREEBSD_VERSION}" -lt 9 ]; then su root -c \ "pkg_delete -f 'libaura-*' pkg_delete -f 'libinstaller-*' From 45a29f66d137d5a3d6aa63897d99315281153ac7 Mon Sep 17 00:00:00 2001 From: Key4ce Date: Wed, 15 Oct 2014 01:30:39 +0200 Subject: [PATCH 4/5] syntax : fi OD fixed --- scripts/build/build_installer_packages.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build/build_installer_packages.sh b/scripts/build/build_installer_packages.sh index e6816f2..dbbfe12 100755 --- a/scripts/build/build_installer_packages.sh +++ b/scripts/build/build_installer_packages.sh @@ -87,7 +87,6 @@ if [ -n "${FREEBSD_VERSION}" -a "${FREEBSD_VERSION}" -lt 9 ]; then pkg delete -yf 'thttpd-notimeout-*' pkg delete -yf 'lua50-*' pkg delete -yf 'bsdinstaller-*'" - fi fi if [ "X$REMOVEOLDPKGS" = "XYES" ]; then From c1ab9abca4a1810287ed28b466a6352498a850ed Mon Sep 17 00:00:00 2001 From: Key4ce Date: Wed, 15 Oct 2014 01:37:28 +0200 Subject: [PATCH 5/5] fixed indent --- scripts/build/build_installer_packages.sh | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/build/build_installer_packages.sh b/scripts/build/build_installer_packages.sh index dbbfe12..3afaa51 100755 --- a/scripts/build/build_installer_packages.sh +++ b/scripts/build/build_installer_packages.sh @@ -72,21 +72,21 @@ rebuild_port() } if [ -n "${FREEBSD_VERSION}" -a "${FREEBSD_VERSION}" -lt 9 ]; then - su root -c \ - "pkg_delete -f 'libaura-*' - pkg_delete -f 'libinstaller-*' - pkg_delete -f '*dfui*' - pkg_delete -f 'thttpd-notimeout-*' - pkg_delete -f 'lua50-*' - pkg_delete -f 'bsdinstaller-*'" - else - su root -c \ - "pkg delete -yf 'libaura-*' - pkg delete -yf 'libinstaller-*' - pkg delete -yf '*dfui*' - pkg delete -yf 'thttpd-notimeout-*' - pkg delete -yf 'lua50-*' - pkg delete -yf 'bsdinstaller-*'" + su root -c \ + "pkg_delete -f 'libaura-*' + pkg_delete -f 'libinstaller-*' + pkg_delete -f '*dfui*' + pkg_delete -f 'thttpd-notimeout-*' + pkg_delete -f 'lua50-*' + pkg_delete -f 'bsdinstaller-*'" +else + su root -c \ + "pkg delete -yf 'libaura-*' + pkg delete -yf 'libinstaller-*' + pkg delete -yf '*dfui*' + pkg delete -yf 'thttpd-notimeout-*' + pkg delete -yf 'lua50-*' + pkg delete -yf 'bsdinstaller-*'" fi if [ "X$REMOVEOLDPKGS" = "XYES" ]; then