diff --git a/public/css/setup.css b/public/css/setup.css index 2a8f01f..743f402 100644 --- a/public/css/setup.css +++ b/public/css/setup.css @@ -71,6 +71,7 @@ h4, p { .setup-qmark { width: 2em; + margin-left: 0.3em; display: inline; } diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php index 91877d7..f77b43c 100644 --- a/resources/views/setup.blade.php +++ b/resources/views/setup.blade.php @@ -69,7 +69,7 @@ Setup

If public interface is hidden, redirect index page to: - +

diff --git a/util/restore_stock_env.sh b/util/restore_stock_env.sh index a5bc73d..c4019ad 100644 --- a/util/restore_stock_env.sh +++ b/util/restore_stock_env.sh @@ -1,3 +1,3 @@ mv .env .env.bak -wget https://raw.githubusercontent.com/cydrobolt/polr/2.0-dev/.env +wget https://raw.githubusercontent.com/cydrobolt/polr/master/.env.setup echo "Done!" diff --git a/util/version.py b/util/version.py new file mode 100644 index 0000000..9ee8f1c --- /dev/null +++ b/util/version.py @@ -0,0 +1,25 @@ +import re, datetime, string, random + +print "New version name (e.g 2.0.0):" +new_version = raw_input() + +with open('.env.setup', 'r+') as setup_env: + setup_env_lines = setup_env.read() + now = datetime.datetime.now() + + new_setup_key = ''.join(random.SystemRandom().choice(string.ascii_letters + string.digits + string.punctuation) for _ in range(32)) + + # 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'(?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) + + # Overwite existing file + setup_env.seek(0) + setup_env.write(setup_env_lines) + setup_env.truncate() + +print "Done!" diff --git a/version.sh b/version.sh deleted file mode 100644 index e69de29..0000000