made version output conditional

45Drives · Aug 25, 2021 · 970ca61 · 970ca61
1 parent e14cfd3
commit 970ca61
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Serial45d 1.0.0-12
+## Serial45d 1.0.0-13
 
-* updated serial version welcome text
+* made version output in welcome message conditional
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "title": "Serial45d",
     "prerelease": true,
     "version": "1.0.0",
-    "buildVersion": "12",
+    "buildVersion": "13",
     "author": "Mark Hooper <mhooper@45drives.com>",
     "url": "https://github.com/45Drives/serial45d",
     "category": "utils",
@@ -49,7 +49,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "1.0.0",
-        "buildVersion": "12",
+        "buildVersion": "13",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <mhooper@45drives.com>",

diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec
@@ -42,6 +42,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-13
+- made version output in welcome message conditional
 * Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-12
 - updated serial version welcome text
 * Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-11

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -42,6 +42,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-13
+- made version output in welcome message conditional
 * Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-12
 - updated serial version welcome text
 * Wed Aug 25 2021 Mark Hooper <mhooper@45drives.com> 1.0.0-11

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+serial45d (1.0.0-13focal) focal; urgency=medium
+
+  * made version output in welcome message conditional
+
+ -- Mark Hooper <mhooper@45drives.com>  Wed, 25 Aug 2021 10:33:13 -0300
+
 serial45d (1.0.0-12focal) focal; urgency=medium
 
   * updated serial version welcome text

diff --git a/src/fakeroot/opt/45drives/serial45d/serial45d b/src/fakeroot/opt/45drives/serial45d/serial45d
@@ -29,25 +29,26 @@ g_update_config = False
 g_current_dir = os.path.dirname(os.path.realpath(__file__))
 
 def outputSerialVersion():
+	print("\n")
+	print("-------------------------------------------------------------------------------")
+	print("                                                                               ")
+	print("                              $$\           $$\ $$\   $$\ $$$$$$$\  $$$$$$$\   ")
+	print("                              \__|          $$ |$$ |  $$ |$$  ____| $$  __$$\  ")
+	print(" $$$$$$$\  $$$$$$\   $$$$$$\  $$\  $$$$$$\  $$ |$$ |  $$ |$$ |      $$ |  $$ | ")
+	print("$$  _____|$$  __$$\ $$  __$$\ $$ | \____$$\ $$ |$$$$$$$$ |$$$$$$$\  $$ |  $$ | ")
+	print("\$$$$$$\  $$$$$$$$ |$$ |  \__|$$ | $$$$$$$ |$$ |\_____$$ |\_____$$\ $$ |  $$ | ")
+	print(" \____$$\ $$   ____|$$ |      $$ |$$  __$$ |$$ |      $$ |$$\   $$ |$$ |  $$ | ")
+	print("$$$$$$$  |\$$$$$$$\ $$ |      $$ |\$$$$$$$ |$$ |      $$ |\$$$$$$  |$$$$$$$  | ")
+	print("\_______/  \_______|\__|      \__| \_______|\__|      \__| \______/ \_______/  ")
 	ver_file_path = f"{g_current_dir}/configs/version"
 	if(os.path.exists(ver_file_path) and os.path.isfile(ver_file_path)):
 		ver_file = open(ver_file_path,"r")
 		version = ver_file.readline()
 		ver_file.close()
-
-		print("\n")
-		print("-------------------------------------------------------------------------------")
-		print("                              $$\           $$\ $$\   $$\ $$$$$$$\  $$$$$$$\   ")
-		print("                              \__|          $$ |$$ |  $$ |$$  ____| $$  __$$\  ")
-		print(" $$$$$$$\  $$$$$$\   $$$$$$\  $$\  $$$$$$\  $$ |$$ |  $$ |$$ |      $$ |  $$ | ")
-		print("$$  _____|$$  __$$\ $$  __$$\ $$ | \____$$\ $$ |$$$$$$$$ |$$$$$$$\  $$ |  $$ | ")
-		print("\$$$$$$\  $$$$$$$$ |$$ |  \__|$$ | $$$$$$$ |$$ |\_____$$ |\_____$$\ $$ |  $$ | ")
-		print(" \____$$\ $$   ____|$$ |      $$ |$$  __$$ |$$ |      $$ |$$\   $$ |$$ |  $$ | ")
-		print("$$$$$$$  |\$$$$$$$\ $$ |      $$ |\$$$$$$$ |$$ |      $$ |\$$$$$$  |$$$$$$$  | ")
-		print("\_______/  \_______|\__|      \__| \_______|\__|      \__| \______/ \_______/  ")
-		print("                                                                               ")
 		print("                                                              Version: {v}".format(v=version))
-		print("-------------------------------------------------------------------------------\n")
+	else:
+		print("                                                                               ")
+	print("-------------------------------------------------------------------------------\n")
 
 
 ##################################################################################