From 9cc95c020909563486f404b186e15ed71dd8a83a Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 27 Dec 2019 19:46:38 +0000
Subject: [PATCH 1/2] feat(codenamemap): update for current versions

---
 postgres/codenamemap.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index 4b3799f..078d181 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -54,28 +54,31 @@
 {% endmacro %}
 
 ## Debian GNU/Linux (the second parameter refers to the postgresql package version, not the distro)
-{{ debian_codename('wheezy', '9.1') }}
+# http://apt.postgresql.org/pub/repos/apt/dists/
+# https://packages.debian.org/search?keywords=postgresql&searchon=names
 {{ debian_codename('jessie', '9.4') }}
 {{ debian_codename('stretch', '9.6') }}
 {{ debian_codename('buster', '11') }}
 
 # `oscodename` grain has long distro name
 # if `lsb-release` package not installed
-{{ debian_codename('wheezy', '9.1', 'Debian GNU/Linux 7 (wheezy)') }}
 {{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
 {{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
 {{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
 
 ## Ubuntu
-{{ debian_codename('trusty', '9.3') }}
+# http://apt.postgresql.org/pub/repos/apt/dists/
+# https://packages.ubuntu.com/search?keywords=postgresql&searchon=names
 {{ debian_codename('xenial', '9.5') }}
-{{ debian_codename('artful', '9.6') }}
 {{ debian_codename('bionic', '10') }}
-{{ debian_codename('cosmic', '10') }}
+{{ debian_codename('eoan', '11') }}
+{{ debian_codename('focal', '12') }}
 
 ## Fedora
+# http://apt.postgresql.org/pub/repos/yum/reporpms/
+# https://apps.fedoraproject.org/packages/postgresql
 # `oscodename` grain has long distro name
-{{ fedora_codename('Fedora-27', '9.6', 'Fedora 27 (Twenty Seven)') }}
-{{ fedora_codename('Fedora-26', '9.6', 'Fedora 26 (Twenty Six)') }}
+{{ fedora_codename('Fedora-31', '11', 'Fedora 31 (Thirty One)') }}
+{{ fedora_codename('Fedora-30', '11', 'Fedora 30 (Thirty)') }}
 
 # vim: ft=sls

From d538798ee4423ecb72b29bd39e4f35437412ce43 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 27 Dec 2019 19:59:32 +0000
Subject: [PATCH 2/2] fix(mac_shortcut.sh): fix `shellcheck` error

```bash
In postgres/templates/mac_shortcut.sh line 3:
shortcutName='${1}'
             ^----^ SC2016: Expressions don't expand in single quotes, use double quotes for that.
```
---
 postgres/templates/mac_shortcut.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/postgres/templates/mac_shortcut.sh b/postgres/templates/mac_shortcut.sh
index 4f560bf..c9c6187 100755
--- a/postgres/templates/mac_shortcut.sh
+++ b/postgres/templates/mac_shortcut.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-shortcutName='${1}'
+shortcutName="${1}"
 app="postgres.app"
 Source="/Applications/$app"
 Destination="{{ homes }}/{{ user }}/Desktop/${shortcutName}"
 /usr/bin/osascript -e "tell application \"Finder\" to make alias file to POSIX file \"$Source\" at POSIX file \"$Destination\""
-