Bump version to 2.2.0; fix versioning script

Author: cydrobolt

.env.setup

@@ -1,6 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
-APP_KEY=,faO^ofvGeJ8|Z.q{mWp=^i}Cmzj+k&K
+APP_KEY=Su;8^J%x"J4}S{M`9O~%]icH^~b^*.B.
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
@@ -16,7 +16,7 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=file
 
-VERSION=2.1.1
-VERSION_RELMONTH=December
-VERSION_RELDAY=9
-VERSION_RELYEAR=2016
+VERSION=2.2.0
+VERSION_RELMONTH=May
+VERSION_RELDAY=6
+VERSION_RELYEAR=2017

util/version.py

@@ -15,7 +15,7 @@
     # Update setup key
     setup_env_lines = re.sub(r'(?is)APP_KEY=[^\n]+', 'APP_KEY={}'.format(new_setup_key), setup_env_lines)
     # Update date and release in setup env
-    setup_env_lines = re.sub(r'cVERSION=[0-9a-zA-Z\.]+', 'VERSION={}'.format(new_version), setup_env_lines)
+    setup_env_lines = re.sub(r'(?is)VERSION=[0-9a-zA-Z\.]+', 'VERSION={}'.format(new_version), setup_env_lines)
     setup_env_lines = re.sub(r'(?is)VERSION_RELMONTH=\w+', 'VERSION_RELMONTH={}'.format(now.strftime('%B')), setup_env_lines)
     setup_env_lines = re.sub(r'(?is)VERSION_RELDAY=\w+', 'VERSION_RELDAY={}'.format(now.day), setup_env_lines)
     setup_env_lines = re.sub(r'(?is)VERSION_RELYEAR=\w+', 'VERSION_RELYEAR={}'.format(now.year), setup_env_lines)