Add --version and fix jinja for py2 (thinkst#194)

* Add --version and fix jinja for py2

* .

bin/opencanaryd

@@ -5,13 +5,14 @@ PIDFILE="${DIR}/opencanaryd.pid"
 cmd=$1
 
 function usage() {
-    echo -e "\n  OpenCanary v1.0\n"
-    echo -e "\topencanaryd [ --start | --dev | --stop | --restart | --copyconfig | --usermodule | --help ]\n\n"
+    echo -e "\n  OpenCanary\n"
+    echo -e "\topencanaryd [ --start | --dev | --stop | --restart | --copyconfig | --usermodule | --version | --help ]\n\n"
     echo -e "\t\t--start\tStarts the opencanaryd process"
     echo -e "\t\t--dev\tRun the opencanaryd process in the foreground"
     echo -e "\t\t--stop\tStops the opencanaryd process"
     echo -e "\t\t--usermodule\tRun opencanaryd in foreground with only usermodules enabled"
     echo -e "\t\t--copyconfig\tCreates a default config file at /etc/opencanaryd/opencanary.conf"
+    echo -e "\t\t--version\tDisplays the current opencanary version."
     echo -e "\t\t--"
     echo -e "\t\t--help\tThis help\n"
 
@@ -55,6 +56,8 @@ elif [ "${cmd}" == "--copyconfig" ]; then
     sudo cp "${defaultconf}" /etc/opencanaryd/opencanary.conf
     echo -e "[*] A sample config file is ready /etc/opencanaryd/opencanary.conf\n"
     echo    "[*] Edit your configuration, then launch with \"opencanaryd --start\""
+elif [ "${cmd}" == "--version" ]; then
+    python -c "from opencanary import __version__; print(__version__);"
 else
     usage
     exit 1

setup.py

@@ -3,6 +3,14 @@
 from setuptools import setup, find_packages
 import sys
 
+PY3 = sys.version_info > (3,)
+
+# Only check unicode on Python 2, In Python 3 unicode is the default and we can just return the input.
+if sys.version_info[0] < 3:
+    jinja_version = '2.10.1'
+else:
+    jinja_version = '3.0.1'
+
 
 def read(rel_path):
     here = os.path.abspath(os.path.dirname(__file__))
@@ -31,7 +39,7 @@ def get_version(rel_path):
     'PyPDF2==1.26.0',
     'fpdf==1.7.2',
     'passlib==1.7.1',
-    'Jinja2==3.0.1',
+    'Jinja2=={}'.format(jinja_version),
     'ntlmlib==0.72',
     'bcrypt==3.1.7',
     'setuptools==44.0.0',