From 081c0c8b7f8b214c187e725043ce5583b716270c Mon Sep 17 00:00:00 2001
From: Jerome Lebleu <jerome.lebleu@mailoo.org>
Date: Thu, 19 Dec 2013 02:42:29 +0100
Subject: [PATCH] Refactor moulinette versioning

---
 action_map.yml      | 4 ++--
 generate_api_doc.py | 6 +++---
 yunohost.py         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/action_map.yml b/action_map.yml
index b444ef6e..15b41c16 100644
--- a/action_map.yml
+++ b/action_map.yml
@@ -37,9 +37,9 @@
 general_arguments:
         -v:
             full: --version
-            help: Display YunoHost version
+            help: Display moulinette version
             action: version
-            version: YunoHost %version%
+            version: moulinette %version%
 
 #############################
 #           User            #
diff --git a/generate_api_doc.py b/generate_api_doc.py
index 1babea75..74a7b219 100755
--- a/generate_api_doc.py
+++ b/generate_api_doc.py
@@ -28,7 +28,7 @@ import sys
 import yaml
 import json
 import requests
-from yunohost import str_to_func
+from yunohost import str_to_func, __version__
 
 def main():
     """
@@ -47,7 +47,7 @@ def main():
         action_map = yaml.load(f)
 
     resource_list = {
-        'apiVersion': '0.1',
+        'apiVersion': __version__,
         'swaggerVersion': '1.1',
         'basePath': 'http://'+ domain + ':6767',
         'apis': []
@@ -64,7 +64,7 @@ def main():
             'description': category_params['category_help']
         })
         resources[category] = {
-            'apiVersion': '0.1',
+            'apiVersion': __version__,
             'swaggerVersion': '1.1',
             'basePath': 'http://'+ domain + ':6767',
             'apis': []
diff --git a/yunohost.py b/yunohost.py
index 1bacf28f..2722ba95 100644
--- a/yunohost.py
+++ b/yunohost.py
@@ -40,7 +40,7 @@ __credits__ = """
     along with this program; if not, see http://www.gnu.org/licenses
     """
 __author__  = 'Kload <kload@kload.fr>'
-__version__ = '2.0-beta3'
+__version__ = '695'
 
 import os
 import sys