From 0a7d39bc5ecc421f6f1059583b3f75188143b790 Mon Sep 17 00:00:00 2001 From: EliterScripts Date: Tue, 9 Apr 2019 22:01:45 -0700 Subject: [PATCH] working notice --- management/announce_check.py | 7 +++++++ management/pullAnnouncements.py | 5 +++++ setup/questions.sh | 8 ++------ 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 management/announce_check.py create mode 100644 management/pullAnnouncements.py diff --git a/management/announce_check.py b/management/announce_check.py new file mode 100644 index 00000000..bb5f0fbf --- /dev/null +++ b/management/announce_check.py @@ -0,0 +1,7 @@ +import subprocess + +def download_announcements( ignorePrivacy=False ): + if( (ignorePrivacy == True) or ( ) ): + f = + + subprocess.call("pullAnnouncements.sh", shell=True) \ No newline at end of file diff --git a/management/pullAnnouncements.py b/management/pullAnnouncements.py new file mode 100644 index 00000000..6d728c9b --- /dev/null +++ b/management/pullAnnouncements.py @@ -0,0 +1,5 @@ +#!/bin/bash + +cd_command=`cat /usr/local/bin/mailinabox |grep cd` + +if[[cd_command]] \ No newline at end of file diff --git a/setup/questions.sh b/setup/questions.sh index ad83345a..a8c0071b 100644 --- a/setup/questions.sh +++ b/setup/questions.sh @@ -25,9 +25,7 @@ if [ -z "${NONINTERACTIVE:-}" ]; then if [ -z "${I_AGREE_MAILINABOX:-}" ]; then - is_config_agreed=$( check_config_agreed && echo "true" || echo "false") - - if [ "$is_config_agreed" -eq "false"]; then + if [ "$(check_config_agreed; echo $?)" -eq "1"]; then #makes sure the user is aware of our legal stuff. message_box "Mail-in-a-Box Legal Notice" \ @@ -47,9 +45,7 @@ if [ -z "${NONINTERACTIVE:-}" ]; then I_AGREE_MAILINABOX=$(/bin/true) else - is_config_agreed=$( check_config_agreed && echo "true" || echo "false") - - if [ "$is_config_agreed" -eq "true"]; then + if [ "$(check_config_agreed; echo $?)" -eq "0"]; then I_AGREE_MAILINABOX=$(/bin/true) fi