From 6f6562f559300eed49cc3b42336b0d1edf71f695 Mon Sep 17 00:00:00 2001
From: MunyDev <jeffplays1292@gmail.com>
Date: Sat, 10 Aug 2024 06:34:17 -0400
Subject: [PATCH] Added some fixes

---
 get_original_data.sh                   | 4 ++--
 make_out.sh                            | 9 ++++++---
 src/root_store_gen/generate_new_pbs.py | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 get_original_data.sh

diff --git a/get_original_data.sh b/get_original_data.sh
old mode 100644
new mode 100755
index b233dc5..f6f1cc7
--- a/get_original_data.sh
+++ b/get_original_data.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-echo This script may be removed or disabled with discretion of google.
+echo This script may be removed or disabled later with discretion of google.
 
 # Search directory for versions
-HIGHESTVERSIONAPPARENTLY=$(find  $HOME/.config/google-chrome/PKIMetadata/ -maxdepth 1 -mindepth 1 -type d| head -n 1)
+HIGHESTVERSIONAPPARENTLY=$(find  "$HOME"/.config/google-chrome/PKIMetadata/ -maxdepth 1 -mindepth 1 -type d| head -n 1)
 
 #Let the user know what version we are on
 echo "$HIGHESTVERSIONAPPARENTLY"
diff --git a/make_out.sh b/make_out.sh
index 5bff516..553d38c 100755
--- a/make_out.sh
+++ b/make_out.sh
@@ -12,16 +12,19 @@ mkdir "${SCRIPT_DIR}"/out
 mkdir -p "${SCRIPT_DIR}"/out/PKIMetadata/2000/.
 cp -rvf "${SCRIPT_DIR}"/original/PKIMetadata/2000/. "${SCRIPT_DIR}"/out/PKIMetadata/2000
 rm -rvf "${SCRIPT_DIR}"out/PKIMetadata/2000/_metadata # verified contents not necessary
+rm -rvf "${SCRIPT_DIR}out/PKIMetadata/2000/"*.fingerprint
 python3 ./src/root_store_gen/generate_new_pbs.py "${SCRIPT_DIR}/original/PKIMetadata/2000/crs.pb" "$@" "${SCRIPT_DIR}/out/PKIMetadata/2000/crs.pb"
 # Modify version in manifest
 
-python3 <<EOF
+python3 <<EOF # Set version in manifest
 import json
-from pathlib import Path
+from pathlib import Path 
 mjs = '${SCRIPT_DIR}/original/PKIMetadata/2000/manifest.json'
 mjs = Path(mjs)
+newfile = Path('${SCRIPT_DIR}/out/PKIMetadata/2000/manifest.json')
 dat = Path.read_text(mjs)
 x = json.loads(dat)
-x['version'] = "2000"
+x['version'] = "2000" 
+print(json.dumps(x))
 mjs.write_text(json.dumps(x))
 EOF
\ No newline at end of file
diff --git a/src/root_store_gen/generate_new_pbs.py b/src/root_store_gen/generate_new_pbs.py
index 5d72ae1..4c54638 100644
--- a/src/root_store_gen/generate_new_pbs.py
+++ b/src/root_store_gen/generate_new_pbs.py
@@ -24,7 +24,7 @@ rs.ParseFromString(buf.read())
 print(rs.trust_anchors)
 for ca in cas:
     with open(ca, 'rb') as file:
-        print(f"Loading Certificate Authority {ca} into rootstore")
+        print(f"""Loading Certificate Authority at path "{ca}" into rootstore""")
         der = file.read()
         next_trust_anchor = crs_pb2.TrustAnchor()
         next_trust_anchor.Clear()