fixes #301 Create template broken

pharo-project · Feb 4, 2019 · d0831e1 · d0831e1
1 parent 2ed7e3c
commit d0831e1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/PharoLauncher-Core/PhLImage.class.st b/src/PharoLauncher-Core/PhLImage.class.st
@@ -226,6 +226,12 @@ PhLImage >> showNativeFolder [
 	OSPlatform current openFileBrowserOn: file
 ]
 
+{ #category : #accessing }
+PhLImage >> sourcesFile [
+	^ self file parent files 
+		detect: [ :fileRef | fileRef extension = 'sources' ]
+]
+
 { #category : #printing }
 PhLImage >> summaryInfo [
 	^ String
@@ -245,6 +251,11 @@ PhLImage >> template [
 	^ self meta at: #template ifPresent: [ :t | t name ] ifAbsent: [ #unknown ]
 ]
 
+{ #category : #accessing }
+PhLImage >> versionFile [
+	^ self file parent / PhLVirtualMachineManager imageVersionFileName
+]
+
 { #category : #action }
 PhLImage >> vm [
 	^ (PhLVirtualMachineManager forImage: file pathString) vmFileName

diff --git a/src/PharoLauncher-Core/PhLTemplateGroupRepository.class.st b/src/PharoLauncher-Core/PhLTemplateGroupRepository.class.st
@@ -42,10 +42,17 @@ PhLTemplateGroupRepository >> createLocalTemplateNamed: aString [
 
 { #category : #action }
 PhLTemplateGroupRepository >> createZipArchiveFrom: anImage named: aString [
-	ZipArchive new
-		addFile: anImage imageFile as: aString , '.image';
-		addFile: anImage changesFile as: aString , '.changes';
-		writeToFileNamed: PhLDownloadedTemplateGroup default baseDirectory / aString , 'zip'
+	| archive |
+	archive := ZipArchive new.
+	archive
+		addFile: anImage imageFile fullName as: aString , '.image';
+		addFile: anImage changesFile fullName as: aString , '.changes'.
+	[ archive addFile: anImage sourcesFile fullName as: anImage sourcesFile basename ]
+		on: NotFound 
+		do: [ :e | "ignore the file" ].
+	anImage versionFile exists
+		ifTrue: [ archive addFile: anImage versionFile fullName as: anImage versionFile basename ].
+	archive writeToFileNamed: (PhLDownloadedTemplateGroup default baseDirectory / aString , 'zip') fullName
 ]
 
 { #category : #action }