diff --git a/install.sh b/install.sh index 60eaa0c..5360939 100644 --- a/install.sh +++ b/install.sh @@ -63,7 +63,6 @@ else fi defusername=`echo $serverJson | jq -r ".users | keys[0]"` defpassword=`echo $serverJson | jq -r ".users.$defusername.pw"` -deftimezone=`echo $settingsJson | jq -r ".settings.timezone"` read -p "Change port? [$defport] " port if [[ ! $port =~ ^[0-9]+$ ]]; then @@ -87,18 +86,12 @@ read -p "Password [$defpassword]: " password if [[ $password == "" ]]; then password=$defpassword fi -echo "Find your timezone here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" -read -p "Enter your timezone [$deftimezone]: " timezone -if [[ $timezone == "" ]]; then - timezone=$deftimezone -fi serverJson=`echo $serverJson | jq ".ui.port=$port"` serverJson=`echo $serverJson | jq ".ui.https=$https"` serverJson=`echo $serverJson | jq ".users.$defusername.pw=\"$password\""` if [ "$defusername" != "$username" ]; then serverJson=`echo $serverJson | jq ".users.$username=.users.$defusername | del(.users.$defusername)"` fi -settingsJson=`echo $settingsJson | jq ".settings.timezone=\"$timezone\""` echo $settingsJson | jq '.' | sudo tee $basedir/settings.json > /dev/null echo $serverJson | jq '.' | sudo tee $basedir/server.json > /dev/null diff --git a/setup.py b/setup.py index af4104d..6450a03 100644 --- a/setup.py +++ b/setup.py @@ -1,19 +1,19 @@ from setuptools import setup, find_packages REQUIRES = [ - 'Flask==1.1.1', - 'Flask-SocketIO==4.2.1', - 'Flask-Login==0.4.1', - 'requests==2.22.0', - 'pytz==2019.2', - 'paho-mqtt==1.4.0', - 'RPi.GPIO==0.7.0', + 'Flask>=1.1.1', + 'Flask-SocketIO>=4.2.1', + 'Flask-Login>=0.4.1', + 'requests>=2.22.0', + 'pytz>=2019.2', + 'paho-mqtt>=1.4.0', + 'RPi.GPIO>=0.7.0', ] setup( name='AlarmPI', - version='4.0', + version='4.1', description='Home Security System', author='bkbilly', author_email='bkbilly@hotmail.com',