Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit adc6659

Browse files
Small fixes
- Added the readme to the - Improved some behaviour of the app in case of problems with the installer app/usb drive. - Bug fix.
1 parent 0a82d25 commit adc6659

File tree

7 files changed

+29
-7
lines changed

7 files changed

+29
-7
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ Contact the project creator (ITzTravelInTime aka Pietro):
5656
https://www.reddit.com/user/ITzTravelInTime
5757
- email:
5858
piecaruso97@gmail.com
59+
60+
# Swift packages used:
61+
62+
- https://github.com/ITzTravelInTime/Command
63+
- https://github.com/ITzTravelInTime/CommandSudo
64+
- https://github.com/ITzTravelInTime/SwiftCPUDetect
65+
- https://github.com/ITzTravelInTime/SwiftLoggedPrint
66+
- https://github.com/ITzTravelInTime/TINUNotifications
67+
- https://github.com/ITzTravelInTime/TINURecovery
5968

6069
# Repository rules:
6170
- If you want to create your own spin-off version of TINU please let the project maintainers know!

TINU.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
C6DF04781F4F33C500D200B1 /* TINUTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DF04771F4F33C500D200B1 /* TINUTests.swift */; };
101101
C6DF04831F4F33C500D200B1 /* TINUUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DF04821F4F33C500D200B1 /* TINUUITests.swift */; };
102102
C6E32EA7218142EA006D4BEB /* FileAliasManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E32EA6218142EA006D4BEB /* FileAliasManager.swift */; };
103+
C6E335AF26CED3570078FC0D /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = C6E335AD26CED3570078FC0D /* LICENSE */; };
104+
C6E335B026CED3570078FC0D /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = C6E335AE26CED3570078FC0D /* README.md */; };
103105
C6F0E84326A7A81E00308B9F /* LogWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F0E84226A7A81E00308B9F /* LogWindowController.swift */; };
104106
C6F68E8B20D0277B00F7A0F4 /* PackagesWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F68E8A20D0277B00F7A0F4 /* PackagesWrapper.swift */; };
105107
C6FFB5D6267FAA3300CD19CE /* InstallerAppInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6FFB5D5267FAA3300CD19CE /* InstallerAppInfo.swift */; };
@@ -232,6 +234,8 @@
232234
C6DF04821F4F33C500D200B1 /* TINUUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TINUUITests.swift; sourceTree = "<group>"; };
233235
C6DF04841F4F33C500D200B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
234236
C6E32EA6218142EA006D4BEB /* FileAliasManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileAliasManager.swift; sourceTree = "<group>"; };
237+
C6E335AD26CED3570078FC0D /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
238+
C6E335AE26CED3570078FC0D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
235239
C6F0E84226A7A81E00308B9F /* LogWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogWindowController.swift; sourceTree = "<group>"; };
236240
C6F68E8A20D0277B00F7A0F4 /* PackagesWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackagesWrapper.swift; sourceTree = "<group>"; };
237241
C6FFB5D5267FAA3300CD19CE /* InstallerAppInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallerAppInfo.swift; sourceTree = "<group>"; };
@@ -489,6 +493,8 @@
489493
C6DF04641F4F33C500D200B1 /* TINU */ = {
490494
isa = PBXGroup;
491495
children = (
496+
C6E335AD26CED3570078FC0D /* LICENSE */,
497+
C6E335AE26CED3570078FC0D /* README.md */,
492498
C6DE523A247EB6EA00FBD2E1 /* TINU.entitlements */,
493499
C6DF046E1F4F33C500D200B1 /* Info.plist */,
494500
C691BFED1F6DEEA800589EF8 /* Assets.xcassets */,
@@ -701,9 +707,11 @@
701707
C660D1A2252C94860027FCA0 /* ConfigMenuAppsIt.json in Resources */,
702708
C660D1A0252C7A160027FCA0 /* ConfigMenuAppsEn.json in Resources */,
703709
C660D1992529BB260027FCA0 /* EFIPMTextAssetsIt.json in Resources */,
710+
C6E335B026CED3570078FC0D /* README.md in Resources */,
704711
C63F036224E40F5500F950B4 /* TextAssetsEn.json in Resources */,
705712
C691BFEE1F6DEEA800589EF8 /* Assets.xcassets in Resources */,
706713
C660D19C2529BB780027FCA0 /* EFIPMTextAssetsEn.json in Resources */,
714+
C6E335AF26CED3570078FC0D /* LICENSE in Resources */,
707715
C68C79F22505205A00BBDA37 /* TextAssetsIt.json in Resources */,
708716
C6188D982513828E00BCBC51 /* AppDownloadsEn.json in Resources */,
709717
C6A3A36A24FBAC3500CC8E37 /* ErrorDecodingMessangesEn.json in Resources */,

TINU/Base.lproj/Main.storyboard

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
734734
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="GPN-6Q-q2a">
735735
<font key="font" metaFont="smallSystem"/>
736-
<mutableString key="title">Nicola Tomarelli, Roberto Sciortino, Raffaele Sonnessa, Ermanno Nicoletti, Tommaso Dimatore, Massimiliano Faralli, Francesco Perchiazzi, Peter Paul Chato.
Italian hackintosh group!!! on Facebook for testing.
Hackintosh Italia on Telegram for using TINU.
Hackintosh-forum.de for using TINU.</mutableString>
736+
<string key="title">Nicola Tomarelli, Roberto Sciortino, Raffaele Sonnessa, Ermanno Nicoletti, Tommaso Dimatore, Massimiliano Faralli, Francesco Perchiazzi, Peter Paul Chato.
Italian hackintosh group!!! on Facebook for testing.
Hackintosh Italia on Telegram for using TINU.
Hackintosh-forum.de for using TINU.</string>
737737
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
738738
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
739739
</textFieldCell>

TINU/ConfirmViewController.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class ConfirmViewController: GenericViewController, ViewID {
3131

3232
@IBOutlet weak var back: NSButton!
3333
//private var fs: Bool!
34+
35+
3436
override func viewDidAppear() {
3537
super.viewDidAppear()
3638

@@ -98,6 +100,10 @@ class ConfirmViewController: GenericViewController, ViewID {
98100
//yes.isEnabled = false
99101

100102
yes.title = TextManager.getViewString(context: self, stringID: "nextButtonFail")
103+
yes.image = NSImage(named: NSImage.refreshTemplateName)
104+
yes.imagePosition = .imageLeft
105+
106+
back.isHidden = true
101107
info.isHidden = true
102108

103109
driveName.isHidden = true
@@ -157,13 +163,12 @@ class ConfirmViewController: GenericViewController, ViewID {
157163

158164
@IBAction func install(_ sender: Any) {
159165
//sharedVolumeNeedsFormat = fs
166+
tmpWin = nil
160167
if fail{
161-
NSApp.terminate(sender)
168+
let _ = swapCurrentViewController("ChoseDrive")
162169
return
163170
}
164171

165-
tmpWin = nil
166-
167172
let _ = swapCurrentViewController("Install")
168173
}
169174

TINU/InstallingViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ class InstallingViewController: GenericViewController, ViewID{
8686

8787
InstallMediaCreationManager.startInstallProcess()
8888
}else{
89-
self.setActivityLabelText("activityLabel2")
9089

9190
log("Couldn't get valid info about the installer app and/or the drive")
9291

9392
DispatchQueue.main.sync {
93+
self.setActivityLabelText("activityLabel2")
9494
self.goBack()
9595
}
9696
}

TINU/TextAssetsEn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
"titleDrive" : "The drive and macOS installer below will be used, are you sure?",
228228
"backButton" : "Back",
229229
"nextButton" : "Yes, I understand",
230-
"nextButtonFail" : "Quit",
230+
"nextButtonFail" : "Retry",
231231
"optionsButton" : "Options",
232232
"failureTitle" : "Impossible to create the macOS install meadia",
233233
"failureText" : "Error while getting volume/drive and installer app information"

TINU/TextAssetsIt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
"titleDrive" : "Questo disco e quest'app verranno usati. Vuoi procedere?",
229229
"backButton" : "Indietro",
230230
"nextButton" : "Si, procedi",
231-
"nextButtonFail" : "Esci",
231+
"nextButtonFail" : "Riprova",
232232
"optionsButton" : "Opzioni",
233233
"failureTitle" : "Impossiblile procedere",
234234
"failureText" : "Errore durante l'ottenimento delle informazioni relative al disco o alla partizione scelti."

0 commit comments

Comments
 (0)