simplified travis/apt.postgresql.org.sh

Author: funbringer

travis/apt.postgresql.org.sh

@@ -1,79 +1,11 @@
 #!/bin/sh
 
-# script to add apt.postgresql.org to sources.list
-
-# from command like
-CODENAME="$1"
-# lsb_release is the best interface, but not always available
-if [ -z "$CODENAME" ]; then
-    CODENAME=$(lsb_release -cs 2>/dev/null)
-fi
-# parse os-release (unreliable, does not work on Ubuntu)
-if [ -z "$CODENAME" -a -f /etc/os-release ]; then
-    . /etc/os-release
-    # Debian: VERSION="7.0 (wheezy)"
-    # Ubuntu: VERSION="13.04, Raring Ringtail"
-    CODENAME=$(echo $VERSION | sed -ne 's/.*(\(.*\)).*/\1/')
-fi
-# guess from sources.list
-if [ -z "$CODENAME" ]; then
-    CODENAME=$(grep '^deb ' /etc/apt/sources.list | head -n1 | awk '{ print $3 }')
-fi
-# complain if no result yet
-if [ -z "$CODENAME" ]; then
-    cat <<EOF
-Could not determine the distribution codename. Please report this as a bug to
-pgsql-pkg-debian@postgresql.org. As a workaround, you can call this script with
-the proper codename as parameter, e.g. "$0 squeeze".
-EOF
-    exit 1
-fi
-
-# errors are non-fatal above
-set -e
-
-cat <<EOF
-This script will enable the PostgreSQL APT repository on apt.postgresql.org on
-your system. The distribution codename used will be $CODENAME-pgdg.
-
-EOF
-
-case $CODENAME in
-    # known distributions
-    sid|wheezy|squeeze|lenny|etch) ;;
-    precise|lucid) ;;
-    *) # unknown distribution, verify on the web
-	DISTURL="http://apt.postgresql.org/pub/repos/apt/dists/"
-	if [ -x /usr/bin/curl ]; then
-	    DISTHTML=$(curl -s $DISTURL)
-	elif [ -x /usr/bin/wget ]; then
-	    DISTHTML=$(wget --quiet -O - $DISTURL)
-	fi
-	if [ "$DISTHTML" ]; then
-	    if ! echo "$DISTHTML" | grep -q "$CODENAME-pgdg"; then
-		cat <<EOF
-Your system is using the distribution codename $CODENAME, but $CODENAME-pgdg
-does not seem to be a valid distribution on
-$DISTURL
-
-We abort the installation here. Please ask on the mailing list for assistance.
-
-pgsql-pkg-debian@postgresql.org
-EOF
-		exit 1
-	    fi
-	fi
-	;;
-esac
-
-#echo -n "Press Enter to continue, or Ctrl-C to abort."
-#
-#read enter
+# OS version
+CODENAME=trusty
 
 echo "Writing /etc/apt/sources.list.d/pgdg.list ..."
 cat > /etc/apt/sources.list.d/pgdg.list <<EOF
-deb http://apt.postgresql.org/pub/repos/apt/ $CODENAME-pgdg main
-#deb-src http://apt.postgresql.org/pub/repos/apt/ $CODENAME-pgdg main
+deb http://apt.postgresql.org/pub/repos/apt/ $CODENAME-pgdg main $PGVERSION
 EOF
 
 echo "Importing repository signing key ..."
@@ -126,11 +58,3 @@ EOF
 
 echo "Running apt-get update ..."
 apt-get update
-
-cat <<EOF
-
-You can now start installing packages from apt.postgresql.org.
-
-Have a look at https://wiki.postgresql.org/wiki/Apt for more information;
-most notably the FAQ at https://wiki.postgresql.org/wiki/Apt/FAQ
-EOF