Merge branch 'master' into feature/LocateSSHCommands

hbons · Nov 2, 2021 · 2004997 · 2004997
2 parents 6bebb81 + 6ebda3a
commit 2004997
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 24 deletions.
diff --git a/SparkleShare/Common/AboutController.cs b/SparkleShare/Common/AboutController.cs
@@ -61,6 +61,8 @@ void CheckForNewVersion ()
             UpdateLabelEvent ("Checking for updates…");
             Thread.Sleep (500);
 
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
             var web_client = new WebClient ();
             var uri = new Uri ("https://www.sparkleshare.org/version");
 

diff --git a/SparkleShare/Mac/checkGit.sh b/SparkleShare/Mac/checkGit.sh
@@ -1,4 +1,4 @@
-#!/bin/sh                                                                                                                                          
+#!/bin/sh
 function abspath()
 {
   case "${1}" in
@@ -31,12 +31,12 @@ set -e
 
 if [[ ! -f ${projectFolder}/${gitName} ]];
 then
-  curl --silent --location ${gitDownload} > ${gitName}
-  test -e ${gitName} || { echo "Failed to download git"; exit 1; }
+  curl --silent --location ${gitDownload} > ${projectFolder}/${gitName}
+  test -e ${projectFolder}/${gitName} || { echo "Failed to download git"; exit 1; }
 
-  printf "${gitSHA256}  ${gitName}" | shasum --check --algorithm 256
+  printf "${gitSHA256}  ${projectFolder}/${gitName}" | shasum --check --algorithm 256
 
 fi
 
-rm git.tar.gz
-ln -s $gitName git.tar.gz
+rm -f ${projectFolder}/git.tar.gz
+ln -s ${projectFolder}/$gitName ${projectFolder}/git.tar.gz
diff --git a/SparkleShare/Mac/postBuild.sh b/SparkleShare/Mac/postBuild.sh
@@ -10,6 +10,6 @@ export PATH=/usr/local/bin:/opt/local/bin:/Library/Frameworks/Mono.framework/Ver
 
 ${projectFolder}/checkGit.sh
 rm -rf ${bundle}/Contents/Resources/git
-mkdir ${bundle}/Contents/Resources/git
+mkdir -p ${bundle}/Contents/Resources/git
 tar -x -f ${projectFolder}/git.tar.gz --directory ${bundle}/Contents/Resources/git
-cp -R SparkleShareInviteOpener.app ${bundle}/Contents/Resources
+cp -R ${projectFolder}/SparkleShareInviteOpener.app ${bundle}/Contents/Resources
diff --git a/Sparkles/Git/Git.Fetcher.cs b/Sparkles/Git/Git.Fetcher.cs
@@ -176,6 +176,13 @@ public override string Complete (StorageType selected_storage_type)
                 File.WriteAllText (identifier_path, identifier);
                 File.SetAttributes (identifier_path, FileAttributes.Hidden);
 
+                // The repo is freshly cloned and no config user.name is set yet, so temporary use SparkleShare
+                // to avoid error 'TELL ME WHO YOU ARE', later on this will be handled in Commit of Git.Repository
+                var git_config = new GitCommand(TargetFolder, "config user.name \"SparkleShare\"");
+                git_config.StartAndWaitForExit();
+                git_config = new GitCommand(TargetFolder, "config user.email \"[email protected]\"");
+                git_config.StartAndWaitForExit();
+
                 // We can't do the "commit --all" shortcut because it doesn't add untracked files
                 var git_add    = new GitCommand (TargetFolder, "add .sparkleshare");
                 var git_commit = new GitCommand (TargetFolder,

diff --git a/Sparkles/InstallationInfo.cs b/Sparkles/InstallationInfo.cs
@@ -67,25 +67,35 @@ public static string OperatingSystemVersion {
             get {
                 if (OperatingSystem == OS.macOS) {
                     var uname = new Command ("sw_vers", "-productVersion", write_output: false);
-                    string output = uname.StartAndReadStandardOutput ();
-                    string version = output;
+                    string version = uname.StartAndReadStandardOutput ();
+
+                    // 
+                    string[] version_elements= version.Split('.');
 
-                    // Parse the version number between the periods (e.g. "10.12.1" -> 12)
-                    output = output.Substring (output.IndexOf (".") + 1);
-                    if (output.LastIndexOf (".") != -1) {
-                        output = output.Substring (0, output.LastIndexOf ("."));
-                    }
                     string release = "Unreleased Version";
 
-                    switch (int.Parse (output)) {
-                    case 7: release = "Lion"; break;
-                    case 8: release = "Mountain Lion"; break;
-                    case 9: release = "Mavericks"; break;
-                    case 10: release = "Yosemite"; break;
-                    case 11: release = "El Capitan"; break;
-                    case 12: release = "Sierra"; break;
-                    case 13: release = "High Sierra"; break;
-                    case 14: release = "Mojave"; break;
+                    if ((version_elements.Length) >= 2) {
+                        switch (int.Parse (version_elements [0])) {
+                        case 10:
+                            // Parse the version number between the periods (e.g. "10.12.1" -> 12)
+                            switch (int.Parse (version_elements [0])) {
+                            case 7: release = "Lion"; break;
+                            case 8: release = "Mountain Lion"; break;
+                            case 9: release = "Mavericks"; break;
+                            case 10: release = "Yosemite"; break;
+                            case 11: release = "El Capitan"; break;
+                            case 12: release = "Sierra"; break;
+                            case 13: release = "High Sierra"; break;
+                            case 14: release = "Mojave"; break;
+                            case 15: release = "Catalina"; break;
+                            }
+                            break;
+
+                        case 11:
+                            release = "BigSur"; break;
+                        case 12:
+                            release = "Monterey"; break;
+                        }
                     }
 
                     return string.Format ("{0} ({1})", version, release);