Browse Source

Added autocompletion, Git user into installation

bugfixes
gau1991 10 years ago
parent
commit
f44caecade
  1. 4
      ee/core/variables.py
  2. 25
      setup.py

4
ee/core/variables.py

@ -10,8 +10,6 @@ import datetime
class EEVariables():
"""Intialization of core variables"""
config = configparser.ConfigParser()
config.read(os.path.expanduser("~")+'/.gitconfig')
# EasyEngine version
ee_version = "3.0.0"
@ -40,6 +38,8 @@ class EEVariables():
ee_php_user = 'www-data'
# Get git user name and EMail
config = configparser.ConfigParser()
config.read(os.path.expanduser("~")+'/.gitconfig')
try:
ee_user = config['user']['name']
ee_email = config['user']['email']

25
setup.py

@ -3,12 +3,13 @@ from setuptools import setup, find_packages
import sys
import os
import glob
import configparser
conf = []
templates = []
long_description = '''EasyEngine is the commandline tool to manage your
Websites based on WordPress and NGINX with easy to use
Websites based on WordPress and Nginx with easy to use
commands'''
for name in glob.glob('config/plugins.d/*.conf'):
@ -23,6 +24,24 @@ if not os.path.exists('/var/log/ee/'):
if not os.path.exists('/var/lib/ee/'):
os.makedirs('/var/lib/ee/')
# EasyEngine git function
config = configparser.ConfigParser()
config.read(os.path.expanduser("~")+'/.gitconfig')
try:
ee_user = config['user']['name']
ee_email = config['user']['email']
except Exception as e:
print("EasyEngine (ee) required your name & email address to track"
" changes you made under the Git version control")
print("EasyEngine (ee) will be able to send you daily reports & alerts in "
"upcoming version")
print("EasyEngine (ee) will NEVER send your information across")
ee_user = input("Enter username for Git:")
ee_email = input("Enter email for Git:")
os.system("git config --global user.name {0}".format(ee_user))
os.system("git config --global user.email {0}".format(ee_email))
setup(name='ee',
version='3.0',
description=long_description,
@ -56,7 +75,9 @@ setup(name='ee',
],
data_files=[('/etc/ee', ['config/ee.conf']),
('/etc/ee/plugins.d', conf),
('/usr/lib/ee/templates', templates)],
('/usr/lib/ee/templates', templates),
('/etc/bash_completion.d/',
['config/bash_completion.d/ee_auto.rc'])],
setup_requires=[],
entry_points="""
[console_scripts]

Loading…
Cancel
Save