From 22a9609dc497536d213fffd24a36cda05e59a9f5 Mon Sep 17 00:00:00 2001
From: Rune Olsen <ruo@equinor.com>
Date: Fri, 21 Feb 2025 13:16:42 +0100
Subject: [PATCH] Small error fixes

---
 malias.py | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/malias.py b/malias.py
index 7c51390..b765929 100644
--- a/malias.py
+++ b/malias.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+import sys
 import sqlite3
 from pathlib import Path
 from sqlite3 import Error
@@ -6,10 +7,12 @@ import urllib.request
 import json
 import logging
 import argparse
-import requests
+try:
+	import requests
+except ImportError:
+	sys.path.append("/opt/homebrew/lib/python3.11/site-packages")
 import os
 import time 
-import sys
 import git
 from types import SimpleNamespace
 from datetime import datetime
@@ -331,7 +334,7 @@ def checklist(alias):
 	remoteData = json.loads(remote)
 	i = 0
 	for search in remoteData:
-		if alias == remoteData[i]['address'] || alias in remoteData[i]['goto']:
+		if alias == remoteData[i]['address'] == alias in remoteData[i]['goto']:
 			alias_exist = True
 		i=i+1
 	cursor = conn.cursor()
@@ -514,24 +517,21 @@ def show_current_info():
 		else:
 			domain = domain + str(mail_domains[i]['domain_name'])
 		i+=1
-	print('\n[b]malias[/b] - Manage aliases on Mailcow instance.')
+	print('\n[b]malias[/b] - Manage aliases on mailcow Instance.')
 	print('===================================================')
-	print("API key\t\t\t: [b]%s[/b]" % (API))
-    print("Mailcow Instance\t: [b]%s[/b]" % (mail_server))
-    print("Active domains\t\t: [b]%s[/b]" % (domain))
-    print("Mailcow version\t\t: [b]%s[/b]" % (mailcow_version))
-    print("Logfile\t\t\t: [b]%s[/b]" % (logfile))
-    print("Databse\t\t\t: [b]%s[b]" % (database))
-    print("Aliases on server\t: [b]%s[/b]" % (aliases_server))
-    print("Aliases in DB\t\t: [b]%s[/b]" % (alias_db))
-    print("")
-    if app_version[:3] != latest_release:
-        print(
-            "App version\t\t\t\t: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias"
-            % (app_version, latest_release)
-        )
-    else:
-        print("App version\t\t: [b]%s[/b]" % (app_version))
+	print('API key 		: [b]%s[/b]' % (API))
+	print('Mailcow Instance 	: [b]%s[/b]' % (mail_server))
+	print('Active domains		: [b]%s[/b]' % (domain))
+	print('Mailcow version 	: [b]%s[/b]' % (mailcow_version))
+	print('Logfile 		: [b]%s[/b]' % (logfile))
+	print('Databse 		: [b]%s[b]' % (database))
+	print('Aliases on server 	: [b]%s[/b]' % (aliases_server))
+	print('Aliases in DB 		: [b]%s[/b]' % (alias_db))
+	print('')
+	if app_version[:3] != latest_release:
+		print('App version 		: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias' % (app_version,latest_release))
+	else:
+		print('App version 		: [b]%s[/b]' % (app_version))
 	print('')