release.sh: remove version 2 support

Signed-off-by: Ralph Boehme <slow@samba.org>

diff --git a/release.sh b/release.sh
index d57587a65811b7093660fa7c9e99607fc8de6ae3..f6c0d4122131efdc94fc5bf84435bb377b08768e 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -42,84 +42,52 @@ stop_vm() {
 solaris10_x86() {
     print_os "Solaris 10 x86"
     start_vm solx10
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh ralph@10.10.10.208 'PATH=/usr/ccs/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin:/usr/bin ; cd netatalk/pkg/2-2 ; git pull > /dev/null 2>&1 ; gmake; gmake publish'
-    else
-        ssh ralph@10.10.10.208 "PATH=/usr/ccs/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin:/usr/bin ; cd netatalk/pkg/3-1 ; git pull > /dev/null 2>&1 ; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
-    fi
+    ssh ralph@10.10.10.208 "PATH=/usr/ccs/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin:/usr/bin ; cd netatalk/pkg/3-1 ; git pull > /dev/null 2>&1 ; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
     stop_vm solx10
 }
 
 solaris10_sparc() {
     print_os "Solaris 10 SPARC"
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh ralph@10.10.10.209 'PATH=/usr/local/bin:/opt/csw/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/ccs/bin:/opt/sfw/bin ; cd netatalk/pkg/2-2; git pull > /dev/null 2>&1; gmake; gmake publish'
-    else
-        ssh ralph@10.10.10.209 "PATH=/usr/local/bin:/opt/csw/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/ccs/bin:/opt/sfw/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
-    fi
+    ssh ralph@10.10.10.209 "PATH=/usr/local/bin:/opt/csw/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/ccs/bin:/opt/sfw/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
 }
 
 freebsd8_x86() {
     print_os "FreeBSD 8 x86"
     start_vm freebsd8
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh ralph@10.10.10.205 'PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin ; cd netatalk/pkg/2-2; git pull > /dev/null 2>&1; gmake; gmake publish'
-    else
-        ssh ralph@10.10.10.205 "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
-    fi
+    ssh ralph@10.10.10.205 "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
     stop_vm freebsd8
 }
 
 linux_x64() {
     print_os "Linux x64"
     start_vm centos62
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh ralph@10.10.10.215 'PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/2-2; git pull > /dev/null 2>&1; make; make publish'
-    else
-        ssh ralph@10.10.10.215 "PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; make VERSION=$VERSION ; make publish VERSION=$VERSION"
-    fi
+    ssh ralph@10.10.10.215 "PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; make VERSION=$VERSION ; make publish VERSION=$VERSION"
     stop_vm centos62
 }
 
 ab_oi() {
     print_os "OpenIndiana"
     start_vm ab_oi
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh ralph@10.10.10.215 'PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/2-2; git pull > /dev/null 2>&1; make; make publish'
-    else
-        ssh ralph@10.10.10.215 "PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
-    fi
+    ssh ralph@10.10.10.215 "PATH=/usr/local/bin:/usr/bin:/bin ; cd netatalk/pkg/3-1; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION"
     stop_vm ab_oi
 }
 
 # We must use oi159 for OpenIndiana and Solaris 11
 solaris11() {
     print_os "Solaris 11"
-    if [ x"$VERSION" = x"2" ] ; then
-        cd /export/home/ralph/netatalk/pkg/2-2 ; git pull > /dev/null 2>&1; gmake; gmake publish > /dev/null
-    else
-        cd /export/home/ralph/netatalk/pkg/3-1 ; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION> /dev/null
-    fi
+    cd /export/home/ralph/netatalk/pkg/3-1 ; git pull > /dev/null 2>&1; gmake VERSION=$VERSION ; gmake publish VERSION=$VERSION> /dev/null
 }
 
 nexenta() {
     print_os "Nexenta"
     start_vm ns3
-    if [ x"$VERSION" = x"2" ] ; then
-        ssh root@10.10.10.214 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/bin/X11; cd netatalk/pkg/2-2 ; git pull > /dev/null 2>&1; make; make publish > /dev/null'
-    else
-        ssh root@10.10.10.214 "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/bin/X11; cd netatalk/pkg/3-1 ; git pull > /dev/null 2>&1; make VERSION=$VERSION; make publish VERSION=$VERSION> /dev/null"
-    fi
+    ssh root@10.10.10.214 "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/bin/X11; cd netatalk/pkg/3-1 ; git pull > /dev/null 2>&1; make VERSION=$VERSION; make publish VERSION=$VERSION> /dev/null"
     stop_vm ns3
 }
 
 source_archive() {
     print_os "Releasing source"
-    if [ x"$VERSION" = x"2" ] ; then
-        cd /export/home/ralph/netatalk/pkg/2-2 ; gmake source
-    else
-        cd /export/home/ralph/netatalk/pkg/3-1 ; gmake source VERSION=$VERSION
-    fi
+    cd /export/home/ralph/netatalk/pkg/3-1 ; gmake source VERSION=$VERSION
 }
 
 # Customer builds