fix: Rename to 'Reconnect' (#14)

inseven · Jun 22, 2024 · 30978bb · 30978bb
1 parent 35dac7c
commit 30978bb
Show file tree

Hide file tree

Showing 52 changed files with 104 additions and 121 deletions.
diff --git a/PsiMac/PsiMacRelease.entitlements b/PsiMac/PsiMacRelease.entitlements
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PsiMac
+# Reconnect
 
 [![build](https://github.com/inseven/PsiMac/actions/workflows/build.yaml/badge.svg)](https://github.com/inseven/PsiMac/actions/workflows/build.yaml)
 
@@ -10,7 +10,7 @@ The rationale behind creating a new app is that the existing approach taken by p
 
 ## Usage
 
-You probably don't want to try to use PsiMac right now unless you're looking to contribute to the project—functionality is currently incredibly limited. If you're looking to connect to a Psion on macOS today, [plptools](https://github.com/rrthomas/plptools/) provides command line utilities for SIS file installation and FTP-like functionality.
+You probably don't want to try to use Reconnect right now unless you're looking to contribute to the project—functionality is currently incredibly limited. If you're looking to connect to a Psion on macOS today, [plptools](https://github.com/rrthomas/plptools/) provides command line utilities for SIS file installation and FTP-like functionality.
 
 ## Status
 
@@ -154,7 +154,8 @@ At this early stage of development, progress can be tracked by seeing which serv
 
 ## License
 
-PsiMac is licensed under the GNU General Public License (GPL) version 2 (see [LICENSE](LICENSE)). It depends on the following separately licensed third-party libraries and components:
+Reconnect is licensed under the GNU General Public License (GPL) version 2 (see [LICENSE](LICENSE)). It depends on the following separately licensed third-party libraries and components:
 
 - [DataStream](https://github.com/jbmorley/DataStream), MIT License
 - [Diligence](https://github.com/inseven/diligence), MIT License
+- [plptools](https://github.com/rrthomas/plptools/), GPL-2.0 license
diff --git a/PsiMac.xcodeproj/project.pbxproj → Reconnect.xcodeproj/project.pbxproj b/PsiMac.xcodeproj/project.pbxproj → Reconnect.xcodeproj/project.pbxproj
diff --git a/...oj/xcshareddata/xcschemes/PsiMac.xcscheme → ...xcshareddata/xcschemes/Reconnect.xcscheme b/...oj/xcshareddata/xcschemes/PsiMac.xcscheme → ...xcshareddata/xcschemes/Reconnect.xcscheme
@@ -16,9 +16,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D84964D52C1BFCB600405656"
-               BuildableName = "PsiMac.app"
-               BlueprintName = "PsiMac"
-               ReferencedContainer = "container:PsiMac.xcodeproj">
+               BuildableName = "Reconnect.app"
+               BlueprintName = "Reconnect"
+               ReferencedContainer = "container:Reconnect.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -36,9 +36,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D84964E62C1BFCB700405656"
-               BuildableName = "PsiMacTests.xctest"
-               BlueprintName = "PsiMacTests"
-               ReferencedContainer = "container:PsiMac.xcodeproj">
+               BuildableName = "ReconnectTests.xctest"
+               BlueprintName = "ReconnectTests"
+               ReferencedContainer = "container:Reconnect.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
@@ -47,9 +47,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D84964F02C1BFCB700405656"
-               BuildableName = "PsiMacUITests.xctest"
-               BlueprintName = "PsiMacUITests"
-               ReferencedContainer = "container:PsiMac.xcodeproj">
+               BuildableName = "ReconnectUITests.xctest"
+               BlueprintName = "ReconnectUITests"
+               ReferencedContainer = "container:Reconnect.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -69,9 +69,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D84964D52C1BFCB600405656"
-            BuildableName = "PsiMac.app"
-            BlueprintName = "PsiMac"
-            ReferencedContainer = "container:PsiMac.xcodeproj">
+            BuildableName = "Reconnect.app"
+            BlueprintName = "Reconnect"
+            ReferencedContainer = "container:Reconnect.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -86,9 +86,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D84964D52C1BFCB600405656"
-            BuildableName = "PsiMac.app"
-            BlueprintName = "PsiMac"
-            ReferencedContainer = "container:PsiMac.xcodeproj">
+            BuildableName = "Reconnect.app"
+            BlueprintName = "Reconnect"
+            ReferencedContainer = "container:Reconnect.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ssets/AppIcon.appiconset/icon_128x128.png → ...ssets/AppIcon.appiconset/icon_128x128.png b/...ssets/AppIcon.appiconset/icon_128x128.png → ...ssets/AppIcon.appiconset/icon_128x128.png
diff --git a/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected] b/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected]
diff --git a/...cassets/AppIcon.appiconset/icon_16x16.png → ...cassets/AppIcon.appiconset/icon_16x16.png b/...cassets/AppIcon.appiconset/icon_16x16.png → ...cassets/AppIcon.appiconset/icon_16x16.png
diff --git a/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected] b/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected]
diff --git a/...ssets/AppIcon.appiconset/icon_256x256.png → ...ssets/AppIcon.appiconset/icon_256x256.png b/...ssets/AppIcon.appiconset/icon_256x256.png → ...ssets/AppIcon.appiconset/icon_256x256.png
diff --git a/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected] b/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected]
diff --git a/...cassets/AppIcon.appiconset/icon_32x32.png → ...cassets/AppIcon.appiconset/icon_32x32.png b/...cassets/AppIcon.appiconset/icon_32x32.png → ...cassets/AppIcon.appiconset/icon_32x32.png
diff --git a/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected] b/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected]
diff --git a/...ssets/AppIcon.appiconset/icon_512x512.png → ...ssets/AppIcon.appiconset/icon_512x512.png b/...ssets/AppIcon.appiconset/icon_512x512.png → ...ssets/AppIcon.appiconset/icon_512x512.png
diff --git a/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected] b/...ts/AppIcon.appiconset/[email protected] → ...ts/AppIcon.appiconset/[email protected]
diff --git a/.../Assets.xcassets/Connected.imageset/5.png → .../Assets.xcassets/Connected.imageset/5.png b/.../Assets.xcassets/Connected.imageset/5.png → .../Assets.xcassets/Connected.imageset/5.png
diff --git a/...xcassets/Connected.imageset/Contents.json → ...xcassets/Connected.imageset/Contents.json b/...xcassets/Connected.imageset/Contents.json → ...xcassets/Connected.imageset/Contents.json
diff --git a/PsiMac/Assets.xcassets/Contents.json → Reconnect/Assets.xcassets/Contents.json b/PsiMac/Assets.xcassets/Contents.json → Reconnect/Assets.xcassets/Contents.json
diff --git a/...sets.xcassets/Disconnected.imageset/4.png → ...sets.xcassets/Disconnected.imageset/4.png b/...sets.xcassets/Disconnected.imageset/4.png → ...sets.xcassets/Disconnected.imageset/4.png
diff --git a/...ssets/Disconnected.imageset/Contents.json → ...ssets/Disconnected.imageset/Contents.json b/...ssets/Disconnected.imageset/Contents.json → ...ssets/Disconnected.imageset/Contents.json
diff --git a/PsiMac/Extensions/DataReadStream.swift → Reconnect/Extensions/DataReadStream.swift b/PsiMac/Extensions/DataReadStream.swift → Reconnect/Extensions/DataReadStream.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Extensions/Packetable.swift → Reconnect/Extensions/Packetable.swift b/PsiMac/Extensions/Packetable.swift → Reconnect/Extensions/Packetable.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Extensions/Socket.swift → Reconnect/Extensions/Socket.swift b/PsiMac/Extensions/Socket.swift → Reconnect/Extensions/Socket.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Extensions/URL.swift → Reconnect/Extensions/URL.swift b/PsiMac/Extensions/URL.swift → Reconnect/Extensions/URL.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Info.plist → Reconnect/Info.plist b/PsiMac/Info.plist → Reconnect/Info.plist
diff --git a/PsiMac/MachineType.swift → Reconnect/MachineType.swift b/PsiMac/MachineType.swift → Reconnect/MachineType.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Messages/DriveListResponse.swift → Reconnect/Messages/DriveListResponse.swift b/PsiMac/Messages/DriveListResponse.swift → Reconnect/Messages/DriveListResponse.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Messages/MachineInfoResponse.swift → Reconnect/Messages/MachineInfoResponse.swift b/PsiMac/Messages/MachineInfoResponse.swift → Reconnect/Messages/MachineInfoResponse.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Messages/MachineTypeResponse.swift → Reconnect/Messages/MachineTypeResponse.swift b/PsiMac/Messages/MachineTypeResponse.swift → Reconnect/Messages/MachineTypeResponse.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Messages/OwnerInfoResponse.swift → Reconnect/Messages/OwnerInfoResponse.swift b/PsiMac/Messages/OwnerInfoResponse.swift → Reconnect/Messages/OwnerInfoResponse.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Model/ApplicationModel.swift → Reconnect/Model/ApplicationModel.swift b/PsiMac/Model/ApplicationModel.swift → Reconnect/Model/ApplicationModel.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Model/Server.swift → Reconnect/Model/Server.swift b/PsiMac/Model/Server.swift → Reconnect/Model/Server.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json b/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json
diff --git a/PsiMac/PsiMacApp.swift → Reconnect/PsiMacApp.swift b/PsiMac/PsiMacApp.swift → Reconnect/PsiMacApp.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/PsiMacError.swift → Reconnect/PsiMacError.swift b/PsiMac/PsiMacError.swift → Reconnect/PsiMacError.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/PsiMac-Bridging-Header.h → Reconnect/Reconnect-Bridging-Header.h b/PsiMac/PsiMac-Bridging-Header.h → Reconnect/Reconnect-Bridging-Header.h
diff --git a/PsiMac/PsiMac.entitlements → Reconnect/Reconnect.entitlements b/PsiMac/PsiMac.entitlements → Reconnect/Reconnect.entitlements
diff --git a/PsiMac/Servers/FileServer.swift → Reconnect/Servers/FileServer.swift b/PsiMac/Servers/FileServer.swift → Reconnect/Servers/FileServer.swift
diff --git a/PsiMac/Servers/RFSV.swift → Reconnect/Servers/RFSV.swift b/PsiMac/Servers/RFSV.swift → Reconnect/Servers/RFSV.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Servers/RPCS.swift → Reconnect/Servers/RPCS.swift b/PsiMac/Servers/RPCS.swift → Reconnect/Servers/RPCS.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Views/ContentView.swift → Reconnect/Views/ContentView.swift b/PsiMac/Views/ContentView.swift → Reconnect/Views/ContentView.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Views/MainMenu.swift → Reconnect/Views/MainMenu.swift b/PsiMac/Views/MainMenu.swift → Reconnect/Views/MainMenu.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMac/Views/SettingsView.swift → Reconnect/Views/SettingsView.swift b/PsiMac/Views/SettingsView.swift → Reconnect/Views/SettingsView.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMacTests/PsiMacTests.swift → ReconnectTests/PsiMacTests.swift b/PsiMacTests/PsiMacTests.swift → ReconnectTests/PsiMacTests.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import XCTest
-@testable import PsiMac
+@testable import Reconnect
 
 final class PsiMacTests: XCTestCase {
 

diff --git a/PsiMacUITests/PsiMacUITests.swift → ReconnectUITests/PsiMacUITests.swift b/PsiMacUITests/PsiMacUITests.swift → ReconnectUITests/PsiMacUITests.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/PsiMacUITests/PsiMacUITestsLaunchTests.swift → ...ectUITests/PsiMacUITestsLaunchTests.swift b/PsiMacUITests/PsiMacUITestsLaunchTests.swift → ...ectUITests/PsiMacUITestsLaunchTests.swift
@@ -1,4 +1,4 @@
-// PsiMac -- Psion connectivity for macOS
+// Reconnect -- Psion connectivity for macOS
 //
 // Copyright (C) 2024 Jason Morley
 //

diff --git a/...ac_Mac_App_Store_Profile.provisionprofile → ...ct_Mac_App_Store_Profile.provisionprofile b/...ac_Mac_App_Store_Profile.provisionprofile → ...ct_Mac_App_Store_Profile.provisionprofile
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# PsiMac -- Psion connectivity for macOS
+# Reconnect -- Psion connectivity for macOS
 #
 # Copyright (C) 2024 Jason Morley
 #
@@ -30,7 +30,7 @@ BUILD_DIRECTORY="${ROOT_DIRECTORY}/build"
 TEMPORARY_DIRECTORY="${ROOT_DIRECTORY}/temp"
 
 KEYCHAIN_PATH="${TEMPORARY_DIRECTORY}/temporary.keychain"
-ARCHIVE_PATH="${BUILD_DIRECTORY}/PsiMac.xcarchive"
+ARCHIVE_PATH="${BUILD_DIRECTORY}/Reconnect.xcarchive"
 ENV_PATH="${ROOT_DIRECTORY}/.env"
 
 RELEASE_SCRIPT_PATH="${SCRIPTS_DIRECTORY}/release.sh"
@@ -73,7 +73,7 @@ fi
 # TODO: Remove this
 function xcode_project {
     xcodebuild \
-        -project PsiMac.xcodeproj "$@"
+        -project Reconnect.xcodeproj "$@"
 }
 
 function build_scheme {
@@ -126,12 +126,12 @@ echo "$APPLE_DISTRIBUTION_CERTIFICATE_PASSWORD" | build-tools import-base64-cert
 echo "$MACOS_DEVELOPER_INSTALLER_CERTIFICATE_PASSWORD" | build-tools import-base64-certificate --password "$KEYCHAIN_PATH" "$MACOS_DEVELOPER_INSTALLER_CERTIFICATE_BASE64"
 
 # Install the provisioning profiles.
-build-tools install-provisioning-profile "PsiMac_Mac_App_Store_Profile.provisionprofile"
+build-tools install-provisioning-profile "Reconnect_Mac_App_Store_Profile.provisionprofile"
 
 # Build and archive the macOS project.
 sudo xcode-select --switch "$MACOS_XCODE_PATH"
 xcode_project \
-    -scheme "PsiMac" \
+    -scheme "Reconnect" \
     -config Release \
     -archivePath "$ARCHIVE_PATH" \
     OTHER_CODE_SIGN_FLAGS="--keychain=\"${KEYCHAIN_PATH}\"" \
@@ -144,9 +144,9 @@ xcodebuild \
     -exportPath "$BUILD_DIRECTORY" \
     -exportOptionsPlist "ExportOptions.plist"
 
-APP_BASENAME="PsiMac.app"
+APP_BASENAME="Reconnect.app"
 APP_PATH="$BUILD_DIRECTORY/$APP_BASENAME"
-PKG_PATH="$BUILD_DIRECTORY/PsiMac.pkg"
+PKG_PATH="$BUILD_DIRECTORY/Reconnect.pkg"
 
 # Install the private key.
 mkdir -p ~/.appstoreconnect/private_keys/

diff --git a/scripts/environment.sh b/scripts/environment.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# PsiMac -- Psion connectivity for macOS
+# Reconnect -- Psion connectivity for macOS
 #
 # Copyright (C) 2024 Jason Morley
 #

diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# PsiMac -- Psion connectivity for macOS
+# Reconnect -- Psion connectivity for macOS
 #
 # Copyright (C) 2024 Jason Morley
 #

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# PsiMac -- Psion connectivity for macOS
+# Reconnect -- Psion connectivity for macOS
 #
 # Copyright (C) 2024 Jason Morley
 #