-----BEGIN PGP SIGNED MESSAGE-----

Hash: SHA256

RSL 2.5.5

= fixed issue where removing userfolder from adb command changes broke install.txt

HFP
-----BEGIN PGP SIGNATURE-----

iQIyBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmD4fh4ACgkQx/Rql1Vo
czdrvg/3ZzJNCs7+G7Nq4jGNWokm8xNPD8b8YY1zsZy5Vbort0OQVwL875E2UvpS
HDutQWKi9LgUsKRqgXm0T/O/11jTkYqGWowFa9lvuhmFYNiHo+GXirA0Mcsjoxbm
mNp8PI3TE9NjuDj55P4LXXv4v6qngzXsD1A+EqXq/43nKhuv/QWq2rrG52P24MLE
cCK8O1Ir2S0ZpZH5Q/WoeiBJRID+j/ydVuJaXpC95SoBN9TmbSEnAh65gZ5P4eiJ
oYSvgyNtG9y9I5vjTOR3P4khhWhA0NQBNiQPPdi3LuucYcTdKsQb3y3BOQ8ei3Yn
tHxA73Xdfk0mbSlk0GggSUKOLcD4Ij4QQsva4YwG786J2qGf/QvKC0ujf5B/ezzC
bPmWPVl9qJJ+2CVBZ1DuUP/G7+teEz4IGo9VTgiqiwUT61mRv8o7CIdG1RYCNobo
yMX+cHB08KgUb8NE26NrjEm6mqd4AWgvL4Zj/OdKTBdZ/R02WEvQkJgLRji2AZqn
f35TyYxSW64vhOCk1nMpcSJzGfRV0MwA3UU9WOko33ukikXp22dTXtT0LMY2qqZI
vDS7eXHHLI+ctb+gVNms7FagQbDYChSRKy0S5EX6e2EkBGz6jVxfg2lXNfkTHK2V
K8YZkfI5Rx/PKc3pNDIIrdx6h/ya8eEiBCJZ6scLbJvyzNYpfw==
=jTyb
-----END PGP SIGNATURE-----

ADB.cs

@@ -27,8 +27,12 @@ namespace AndroidSideloader
             }
             if (!command.Contains("dumpsys") && !command.Contains("shell pm list packages") && !command.Contains("KEYCODE_WAKEUP")) 
             {
-                string loggedcommand = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "adb.exe");
-                Logger.Log($"Running command{loggedcommand}");
+
+                string logcmd = command;
+
+                if (logcmd.Contains(Environment.CurrentDirectory))
+                    logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+                Logger.Log($"Running command: {logcmd}");
             }
             adb.StartInfo.FileName = adbFilePath;
             adb.StartInfo.Arguments = command;
@@ -82,11 +86,12 @@ namespace AndroidSideloader
             Properties.Settings.Default.ADBFolder = adbFolderPath;
             Properties.Settings.Default.ADBPath = adbFilePath;
             Properties.Settings.Default.Save();
-            
 
+            string logcmd = command;
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running command: {logcmd}");
 
-
-            Logger.Log($"Running command {command}");
             adb.StartInfo.FileName = "cmd.exe";
             adb.StartInfo.RedirectStandardError = true;
             adb.StartInfo.RedirectStandardInput = true;
@@ -135,7 +140,10 @@ namespace AndroidSideloader
             Properties.Settings.Default.ADBPath = adbFilePath;
             Properties.Settings.Default.Save();
 
-            Logger.Log($"Running command {command}");
+            string logcmd = command;
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running command: {logcmd}");
             adb.StartInfo.FileName = @"C:\windows\system32\cmd.exe";
             adb.StartInfo.Arguments = command;
             adb.StartInfo.RedirectStandardError = true;

MainForm.cs

@@ -41,12 +41,12 @@ namespace AndroidSideloader
         {
             InitializeComponent();
 
-            if (!File.Exists(Properties.Settings.Default.CurrentLogPath))
+            if (String.IsNullOrEmpty(Properties.Settings.Default.CurrentLogPath))
             {
 
-                if (File.Exists($"{Environment.CurrentDirectory}\\notes\\nouns.txt"))
+                if (File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
                 {
-                    string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\notes\\nouns.txt");
+                    string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
                     Random r = new Random();
                     int x = r.Next(6806);
                     int y = r.Next(6806);
@@ -186,13 +186,13 @@ namespace AndroidSideloader
                 DialogResult dialogResult = FlexibleMessageBox.Show($"Sideloader crashed during your last use.\nPress OK if you'd like to send us your crash log.\n\n NOTE: THIS CAN TAKE UP TO 30 SECONDS.", "Crash Detected", MessageBoxButtons.OKCancel);
                 if (dialogResult == DialogResult.OK)
                 {
-                    if (File.Exists($"{Environment.CurrentDirectory}\\crashlog.txt") && File.Exists($"{Environment.CurrentDirectory}\\notes\\nouns.txt"))
+                    if (File.Exists($"{Environment.CurrentDirectory}\\crashlog.txt") && File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
                     {
                         Random r = new Random();
                         int x = r.Next(6806);
                         int y = r.Next(6806);
 
-                        string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\notes\\nouns.txt");
+                        string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
                         string randomnoun = lines[new Random(x).Next(lines.Length)];
                         string randomnoun2 = lines[new Random(y).Next(lines.Length)];
                         string combined = randomnoun + "-" + randomnoun2;
@@ -238,6 +238,7 @@ namespace AndroidSideloader
                 progressBar.Invoke(() => { progressBar.Style = ProgressBarStyle.Marquee; });
                 ChangeTitle("Initializing Mirrors");
                 initMirrors(true);
+                SideloaderRCLONE.UpdateNouns(currentRemote);
                 ChangeTitle("Initializing Games");
                 SideloaderRCLONE.initGames(currentRemote);
                 if (!Directory.Exists(SideloaderRCLONE.ThumbnailsFolder) || !Directory.Exists(SideloaderRCLONE.NotesFolder))

RCLONE.cs

@@ -60,8 +60,12 @@ namespace AndroidSideloader
             //set rclonepw
             if (rclonepw.Length > 0)
                 command += " --ask-password=false";
-
-            Logger.Log($"Running Rclone command: {command}");
+            string logcmd = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "rclone.exe");
+            if (logcmd.Contains($"\"{Properties.Settings.Default.CurrentLogPath}\""))
+                logcmd = logcmd.Replace($"\"{Properties.Settings.Default.CurrentLogPath}\"", $"\"{Properties.Settings.Default.CurrentLogName}\"");
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running Rclone command: {logcmd}");
 
             rclone.StartInfo.FileName = Environment.CurrentDirectory + "\\rclone\\rclone.exe";
             rclone.StartInfo.Arguments = command;

SettingsForm.cs

@@ -74,9 +74,9 @@ namespace AndroidSideloader
                 File.Delete($"{Environment.CurrentDirectory}\\debuglog.txt");
 
 
-            if (File.Exists($"{Environment.CurrentDirectory}\\notes\\nouns.txt"))
+            if (File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
             {
-                string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\notes\\nouns.txt");
+                string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
                 Random r = new Random();
                 int x = r.Next(6806);
                 int y = r.Next(6806);

Sideloader/RCLONE.cs

@@ -32,9 +32,15 @@ namespace AndroidSideloader
          */
         public static List<string[]> games = new List<string[]>();
 
+        public static string Nouns = Environment.CurrentDirectory + "\\nouns";
         public static string ThumbnailsFolder = Environment.CurrentDirectory + "\\thumbnails";
         public static string NotesFolder = Environment.CurrentDirectory + "\\notes";
 
+        public static void UpdateNouns(string remote)
+        {
+            RCLONE.runRcloneCommand($"sync \"{remote}:{RcloneGamesFolder}/.meta/nouns\" \"{Nouns}\"");  
+        }   
+        
         public static void UpdateGamePhotos(string remote)
         {
             RCLONE.runRcloneCommand($"sync \"{remote}:{RcloneGamesFolder}/.meta/thumbnails\" \"{ThumbnailsFolder}\"");  

Updater.cs

@@ -17,7 +17,7 @@ namespace AndroidSideloader
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.4.2";
+        static readonly public string LocalVersion = "2.4.5";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 

changelog.txt

@@ -1,6 +1,81 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+RSL 2.4.5
+
+= fixed issue where removing userfolder from adb command changes broke install.txt
+
+HFP
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmD4fqgACgkQx/Rql1Vo
+czd4+g/9ErNeHrdTMIMjCaaQ10ywDyWuoRSMeIik7p+ihaqv6iVDCEeyctjRQ6xF
+eSS52USKMq+4bwnxNHDJsgtALzcKcvxVfVnyPh37t+9CRogNvGx3xWF5JVSBLbSz
+TUpnlhKYkmgwxRLQ+vEnH2GOS4eJb/uuQJA3kSMJeXuocTUhFwQ3QRTdVJAv7U8H
+RuB0qBwCXjU/0MmJqjzRm9nlIuln8zAFGGuGid+dC+hlcoGxgNeADB/7eUma3S+N
+p05E+SCDQKtKDjktiiOXHFAuu9+GR9zlfN6yYoampwEqRYukWje6iMol2ht5atQR
++QgcotrurrZDk/uBrfD2/Q4bhs9ugOCbXns59HHoC01+TyErDgpO3sr5RUSkaY/Y
+JSZ+3AaJPPqNMvrkK9usl1Uv2yNb66VIqQf6FYgt7+PAg5uFJVA1AxquwdisKtm3
+7jFdCri0afBcCd1wYwJg2uajg4xWZsu4KcOZTuJ6vrTi8BZOJQ9LIRU87c6gWhfu
+CdQqajGVpDN/dPEIraCoZwcdQTMJIfKYQEbUOWjavVkEpEA8evIoMpLS+zuqbLa/
+39Dj8DIuP1xv8ZdW/I18Sz21YFL2xZm52M3EKZ4xrDQygK9G70cn9M2o922ZzQHb
+VrxFSBWrhtz2XgrBajXtQy5+fdKAcT1lwUakSd5jBP5ZX//s30w=
+=hKFE
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.4.4
+
+= Updated logs to remove all instances of windows user folder for privacy purposes.
+
+HFP
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmD4Ym8ACgkQx/Rql1Vo
+czfCuA//elSOQ1dUQactp0BZ7cdpDcgoW4YwpEzddc96PwVYULsRxNnREIWKTrjg
+2IGDhR53M9kTpsQ51lFwn+IAanKSl7dTsMh+yJDuZenKJga6eECaxiDHPu6JWnQY
+Hy/zA012f8qoMfK/w0Ti2X3ITMtHGDqhewU9KdNGQNuAp8bH8o6lyqV01QFvyts+
+FTGVB/76I9/OpffDX3fTxTS8PYJvGNAArowAOvYFhf2JcjdjpULo/oH9BVAoCoGT
+8XmTYU/rAukmpWy3ensq0FxtjdD/tJt2NKgJcEzJDpkuxMYdzWUW7Sum+mexyX7k
+VErW/s3w3rUHM/xW7NZgmRcpAqSRwpvvrSFxAKmGXNxEYmWrJ1jM5Nt6zjxzgk8J
+0W7v1M+e/qoUz1HB42Fk++lWENhvZcjJkdRIh8NfjufiA5jc0cZXyZMJClXvMA1K
+kG2PP4OqPnUNZdSPUafSGGjKlkr35tRV8SY1mx9phnMGgMZaVk6V0TPKVjHTfSsV
+FBlFBuUl4EoQUz5bKUNhVszz3Y70aTBRk2M31GjojaBpOrHIj2Z0YiWoFp5maD2o
+cfQ4HjhHAQAqyoD4ID9phgP9UOa0T9eoc1otkzCfRMAkBPS2DysFPpqNCdKOuuJy
+gtfsvQxhALWe1qdDohIOekb2exmKj4NREGI5UjtgT+7Uf13s0Jo=
+=8ePT
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.4.3
+
+= Moved nouns.txt library to a more suitable location.
+
+HFP
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmD4T5kACgkQx/Rql1Vo
+czd9Ew/+LvPnoSuNl3ynFRAjTs8Yo1r2FCY82UfWLLddYTc4waH4s2HZQkUyFBGo
+emkvZUa/TZuYGzNLAB4JpPDYYONyF2LmOx8z0Pwtp1+RoEJbGe7WsZa3oF+PQ2AU
++1+hE0u8RW546uaGdzyToX3N5JnPAA2MctG0+3X5J+k8C+CHWgMJyoDnoz62b2Qb
+gER2HZMBlrebJwSJto+tKeLRDk2FI4UmQDu2CQpvlwkQMwa98ORRrulaO4LOEH3I
+z5S6WyxlcF0Cy4dwD5PVsx4YTHn7Rjy9HHniMYe+vv7LQOz6w+DZZQv6x1BZ2xSF
+ZqS76T3x5XAVpcH2JX7gce7dTFVpft/P/C/vOVAa8E2pUp3stuUFoIyVoeWPwgvJ
+3wkJFeoG4umlLQZY934Mb6Hb2tu38xlcQd/xsO3aZRPUOZBuYMcbpf8V7qv7f+p+
+YDSXwI92ostB3RNkXlUy2onSWrXoLQF70lq3zaNcUeyQt6HILc80h1pXC6VWnITz
+RRH9ojt6CWLyzIXKgqdKWKVJJQ5GIR0YITk4kMyGqM/CP3pUPCUKPAVbWK4ajoGA
+1A2JBniQwYmCj+vkfQDpwkacK3zmYy/JRpTYdyj7BuOXjGnPpberjdd+jpgGBRCH
+IeOpD/kmWaKm5lH1KmEOPGe86bhpQstOba7EsiBM4/x6QpoqVOU=
+=yWnO
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 RSL 2.4HF
 
 = Fixed issues with debuglog and crashlog upload. Both can now be shared with moderation staff without issue.
@@ -21,10 +96,6 @@ LhdoFfG5FLbk2cwKGVmMCPnjAAUJCGZCpmeMaSQscd73j3ezJ3c=
 =bnNu
 -----END PGP SIGNATURE-----
 
-
-
-
-
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
@@ -54,8 +125,6 @@ ZF9xcPCZdA+5HhEqASlt60+kFQ3Z53j68kOsCLNDU2cwWF+rxO4=
 =L7zi
 -----END PGP SIGNATURE-----
 
-
-
 2.2.1
 Turned bold font off.
 -----BEGIN PGP SIGNED MESSAGE-----

version

@@ -1 +1 @@
-2.4.2
+2.4.4