From 5412e3e2f95a5d585cd464a03f00a15b63f333de Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Tue, 8 Jan 2019 23:23:51 +0100
Subject: [PATCH] Cleaned bash/zsh completion

---
 bin/irpman              | 17 ++++++++---------
 irpman-completions.bash | 40 ++++++++++++++++++++++++++++++++++++++++
 pip/setup.py            | 11 +++++++----
 src/version.py          |  2 +-
 4 files changed, 56 insertions(+), 14 deletions(-)
 create mode 100644 irpman-completions.bash

diff --git a/bin/irpman b/bin/irpman
index b7f3ce3..eaae5af 100755
--- a/bin/irpman
+++ b/bin/irpman
@@ -29,21 +29,20 @@
 case "$0" in
   *irpman)
    if [[ -z $1 ]] ; then
-       echo "To activate auto-completion in bash:"
-       echo "source " $0
+      if [[ $(basename $SHELL) == "zsh" ]]
+      then
+        source $(dirname $0)/../irpman-completions.bash
+      else
+        echo "To activate auto-completion in bash/zsh:"
+        echo "source " $0
+      fi
    else
      exec python2 $(dirname $0)/../src/irpman.py $1
    fi
    ;;
 
   *)
-   _irpman_complete()
-   {
-     local cur
-     COMPREPLY=()
-     cur=${COMP_WORDS[COMP_CWORD]}
-     COMPREPLY=( $(compgen -W "`[[ -f tags ]] && cat tags | cut -d'	' -f 1`" -- "$cur" ) )
-   } && complete -F _irpman_complete irpman
+    source $(dirname ${BASH_SOURCE[0]})/../irpman-completions.bash
    ;;
 
 esac
diff --git a/irpman-completions.bash b/irpman-completions.bash
new file mode 100644
index 0000000..3408342
--- /dev/null
+++ b/irpman-completions.bash
@@ -0,0 +1,40 @@
+#!/bin/bash
+#   IRPF90 is a Fortran90 preprocessor written in Python for programming using
+#   the Implicit Reference to Parameters (IRP) method.
+#   Copyright (C) 2009 Anthony SCEMAMA 
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   Anthony Scemama
+#   LCPQ - IRSAMC - CNRS
+#   Universite Paul Sabatier
+#   118, route de Narbonne      
+#   31062 Toulouse Cedex 4      
+#   scemama@irsamc.ups-tlse.fr
+
+if [[ $(basename $SHELL) == "zsh" ]]
+then
+        autoload bashcompinit
+        bashcompinit
+fi
+
+_irpman_complete()
+{
+     local cur
+     COMPREPLY=()
+     cur=${COMP_WORDS[COMP_CWORD]}
+     COMPREPLY=( $(compgen -W "`[[ -f tags ]] && cat tags | cut -d'	' -f 1`" -- "$cur" ) )
+} && complete -F _irpman_complete irpman
+
diff --git a/pip/setup.py b/pip/setup.py
index 034284e..a413f8e 100644
--- a/pip/setup.py
+++ b/pip/setup.py
@@ -1,15 +1,18 @@
 from distutils.core import setup
+import os
+os.path.append("../src")
+import version
 
 setup(
   name = 'irpf90',
   packages = ['irpf90_libs'], # this must be the same as the name above
-  version = '1.6.9',
+  version = version.version,
   description = 'IRPF90 is a Fortran90 preprocessor written in Python for programming using the Implicit Reference to Parameters (IRP) method. It simplifies the development of large fortran codes in the field of scientific high performance computing.',
   author = 'Anthony Scemama',
   author_email = 'scemama@irsamc.ups-tlse.fr',
-  url = 'http://irpf90.ups-tlse.fr', # use the URL to the github repo
-  download_url = 'https://github.com/scemama/irpf90/archive/v1.6.9.tar.gz', # I'll explain this in a second
-  keywords = ['programming', 'fortran', 'IRP'], # arbitrary keywords
+  url = 'http://irpf90.ups-tlse.fr', 
+  download_url = 'https://gitlab.com/scemama/irpf90/archive/v1.7.4.tar.gz',
+  keywords = ['programming', 'fortran', 'IRP'], 
   classifiers = [],
   scripts = ["irpf90", "irpman", "irpf90_indent"],
 )
diff --git a/src/version.py b/src/version.py
index a26c301..582554e 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1 +1 @@
-version = "1.7.3"
+version = "1.7.4"