From 8d3a4736cb5ff2ba9a8f21f38e230b453061bf0d Mon Sep 17 00:00:00 2001 From: boltgolt Date: Sat, 7 Apr 2018 17:39:14 +0200 Subject: [PATCH] Missed howdy command linking and disabled pop cache --- bin/howdy | 2 -- debian/postinst | 13 +++++++++++-- debian/prerm | 12 ++++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) delete mode 100755 bin/howdy diff --git a/bin/howdy b/bin/howdy deleted file mode 100755 index 1ad96be..0000000 --- a/bin/howdy +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -python3 /lib/security/howdy/cli.py diff --git a/debian/postinst b/debian/postinst index 8123346..be4f9b3 100755 --- a/debian/postinst +++ b/debian/postinst @@ -31,7 +31,7 @@ if user is None: log("Upgrading pip to the latest version") # Update pip -handleStatus(subprocess.call(["pip3 install --upgrade pip"], shell=True)) +handleStatus(subprocess.call(["pip3 install --upgrade pip --no-cache-dir"], shell=True)) log("Starting camera check") @@ -111,7 +111,7 @@ handleStatus(subprocess.call(["rm", "-rf", "/tmp/dlib_clone"])) log("Installing face_recognition") # Install face_recognition though pip -handleStatus(subprocess.call(["pip3", "install", "face_recognition"])) +handleStatus(subprocess.call(["pip3", "install", "face_recognition", "--no-cache-dir"])) log("Copying howdy data") @@ -122,6 +122,15 @@ for line in fileinput.input(["/lib/security/howdy/config.ini"], inplace = 1): # Secure the howdy folder handleStatus(subprocess.call(["chmod 600 -R /lib/security/howdy/"], shell=True)) +# Allow anyone to execute the python CLI +handleStatus(subprocess.call(["chmod 755 /lib/security/howdy"], shell=True)) +handleStatus(subprocess.call(["chmod 744 /lib/security/howdy/cli.py"], shell=True)) +handleStatus(subprocess.call(["chmod 744 -R /lib/security/howdy/cli"], shell=True)) + +# Make the CLI executable as howdy +handleStatus(subprocess.call(["ln -s /lib/security/howdy/cli.py /usr/local/bin/howdy"], shell=True)) +handleStatus(subprocess.call(["chmod +x /usr/local/bin/howdy"], shell=True)) + # Install the command autocomplete, don't error on failure # subprocess.call(["sudo cp /lib/security/howdy/autocomplete.sh /etc/bash_completion.d/howdy"], shell=True) diff --git a/debian/prerm b/debian/prerm index 9a6bdb6..28a16e0 100755 --- a/debian/prerm +++ b/debian/prerm @@ -6,11 +6,19 @@ import subprocess # Remove files and symlinks -subprocess.call(["rm -rf /lib/security/howdy/"], shell=True) +try: + subprocess.call(["rm -rf /lib/security/howdy/"], shell=True) +except as e: + pass +try: + subprocess.call(["rm /usr/share/bash-completion/completions/howdy"], shell=True) +except as e: + pass + subprocess.call(["rm /usr/bin/howdy"], shell=True) # Remove face_recognition and dlib -subprocess.call(["pip3 uninstall face_recognition dlib -y"], shell=True) +subprocess.call(["pip3 uninstall face_recognition dlib -y --no-cache-dir"], shell=True) # Print a tearbending message print("""