carsten/teslausb
1
0
Fork 0
mirror of https://github.com/cimryan/teslausb.git synced 2026-03-01 04:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify tests for empty variables. Use caps for globals.

Browse Source
This commit is contained in:
cimryan
2018-10-23 06:52:22 -07:00
parent a8e3671a94
commit 9898fe95ee
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
windows_archive/setup-teslausb
View File

@@ -1,6 +1,6 @@
#!/bin/bash -eu #!/bin/bash -eu
user_enabled_pushover=false USER_ENABLED_PUSHOVER=false
if [[ -z $REPO ]] if [[ -z $REPO ]]
then then
@@ -28,9 +28,9 @@ function check_variable () {
} }
function check_pushover_enabled () { function check_pushover_enabled () {
if [ ! -z "${pushover_enabled+x}" ] if [ "$pushover_enabled" = "true" ]
then then
if [ ! -n "${pushover_user_key+x}" ] || [ ! -n "${pushover_app_key+x}" ] if [[ -z $pushover_user_key ]] || [[ -z $pushover_app_key ]]
then then
echo "STOP: You're trying to setup Pushover but didn't provide your User and/or App key." echo "STOP: You're trying to setup Pushover but didn't provide your User and/or App key."
echo "Define the variables like this:" echo "Define the variables like this:"
@@ -42,7 +42,7 @@ function check_pushover_enabled () {
echo "STOP: You're trying to setup Pushover, but didn't replace the default User and App key values." echo "STOP: You're trying to setup Pushover, but didn't replace the default User and App key values."
exit 1 exit 1
else else
user_enabled_pushover=true USER_ENABLED_PUSHOVER=true
echo "export pushover_enabled=true" > /root/.teslaCamPushoverCredentials echo "export pushover_enabled=true" > /root/.teslaCamPushoverCredentials
echo "export pushover_user_key=$pushover_user_key" >> /root/.teslaCamPushoverCredentials echo "export pushover_user_key=$pushover_user_key" >> /root/.teslaCamPushoverCredentials
echo "export pushover_app_key=$pushover_app_key" >> /root/.teslaCamPushoverCredentials echo "export pushover_app_key=$pushover_app_key" >> /root/.teslaCamPushoverCredentials
@@ -110,7 +110,6 @@ function check_available_space () {
echo "There is sufficient space available." echo "There is sufficient space available."
} }
function get_ancillary_setup_scripts () { function get_ancillary_setup_scripts () {
pushd /tmp pushd /tmp
wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/create-backingfiles-partition.sh wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/create-backingfiles-partition.sh
@@ -189,9 +188,8 @@ function configure_archive_scripts () {
echo "Downloaded script to remount filesystems read/write if needed (/root/remountfs_rw)." echo "Downloaded script to remount filesystems read/write if needed (/root/remountfs_rw)."
} }
function configure_pushover_scripts() { function configure_pushover_scripts() {
if [ ${user_enabled_pushover} = "true" ] if [ ${USER_ENABLED_PUSHOVER} = "true" ]
then then
pushd /root/bin pushd /root/bin
wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/send-pushover wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/send-pushover