Installer error with multiple users on mac #51 (#1984)

* cherry pick * Store artifact * checkout * ls * origin * Use only publish folder of mac installer * Revert Co-authored-by: József L. Kiss <>
specklesystems · Dec 16, 2022 · e8e3ff3 · e8e3ff3
1 parent 7ad8299
commit e8e3ff3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.circleci/scripts/config-template.yml b/.circleci/scripts/config-template.yml
@@ -347,16 +347,16 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Zip installer
           command: |
-            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/
+            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/
             zip -r <<parameters.slug>>.zip ./
       - store_artifacts:
-          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/<<parameters.slug>>.zip
+          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip
       - run:
           name: Copy to installer location
           command: |
             TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999.$WORKFLOW_NUM"; fi;)
             SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
-            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
+            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
           environment:
             WORKFLOW_NUM: << pipeline.number >>
       - when:
@@ -536,4 +536,4 @@ workflows:
             - packandpublish:
                 projectfilepath: DesktopUI2/DesktopUI2/DesktopUI2.csproj
 
-# VS Code Extension Version: 1.4.0
+# VS Code Extension Version: 1.4.0
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/AddOnMain.cpp
@@ -77,6 +77,7 @@ class AvaloniaProcessManager {
 #else
 		static const char* FileName = "ConnectorArchicad.exe";
 #endif
+		static const char* FolderNameCommon = "Common";
 		static const char* FolderName = "ConnectorArchicad";
 
 		IO::Location ownFileLoc;
@@ -87,6 +88,9 @@ class AvaloniaProcessManager {
 
 		IO::Location location (ownFileLoc);
 		location.DeleteLastLocalName ();
+		location.DeleteLastLocalName ();
+		location.DeleteLastLocalName ();
+		location.AppendToLocal (IO::Name (FolderNameCommon));
 		location.AppendToLocal (IO::Name (FolderName));
 		location.AppendToLocal (IO::Name (FileName));