mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 03:29:02 +01:00 
			
		
		
		
	fix server package
This commit is contained in:
		
							parent
							
								
									e5e92c8ece
								
							
						
					
					
						commit
						39c0250833
					
				| @ -44,7 +44,7 @@ cp -R "$script_dir/../build/src" "$DIR" | |||||||
| cp "$script_dir/../build/electron.js" "$DIR" | cp "$script_dir/../build/electron.js" "$DIR" | ||||||
| 
 | 
 | ||||||
| # run in subshell (so we return to original dir) | # run in subshell (so we return to original dir) | ||||||
| (cd $DIR && npm install --omit=dev && npx electron-rebuild) | (cd $DIR && npm install --omit=dev) | ||||||
| 
 | 
 | ||||||
| if [[ -d "$DIR"/node_modules ]]; then | if [[ -d "$DIR"/node_modules ]]; then | ||||||
|     # cleanup of useless files in dependencies |     # cleanup of useless files in dependencies | ||||||
|  | |||||||
| @ -4,13 +4,12 @@ const fs = require('fs-extra'); | |||||||
| module.exports = { | module.exports = { | ||||||
|   packagerConfig: { |   packagerConfig: { | ||||||
|     executableName: "trilium", |     executableName: "trilium", | ||||||
|     name: 'trilium', |     name: 'TriliumNextNotes', | ||||||
|     overwrite: true, |     overwrite: true, | ||||||
|     asar: true, |     asar: true, | ||||||
|     // icon will break once we add .dmg support, since the .ico & .icns have to be in same dir (see https://www.electronforge.io/guides/create-and-add-icons#windows-and-macos)
 |     // icon will break once we add .dmg support, since the .ico & .icns have to be in same dir (see https://www.electronforge.io/guides/create-and-add-icons#windows-and-macos)
 | ||||||
|     icon: "./images/app-icons/icon", |     icon: "./images/app-icons/icon", | ||||||
|     extraResource: getExtraResourcesForPlatform(), |     extraResource: getExtraResourcesForPlatform(), | ||||||
|     files: [{ from: './bin/tpl/anonymize-database.tql', to: '.' }], |  | ||||||
|     afterComplete: [(buildPath, electronVersion, platform, arch, callback) => { |     afterComplete: [(buildPath, electronVersion, platform, arch, callback) => { | ||||||
|       const extraResources = getExtraResourcesForPlatform(); |       const extraResources = getExtraResourcesForPlatform(); | ||||||
|       for (const resource of extraResources) { |       for (const resource of extraResources) { | ||||||
| @ -48,7 +47,7 @@ module.exports = { | |||||||
|       name: '@electron-forge/maker-dmg', |       name: '@electron-forge/maker-dmg', | ||||||
|       arch: ['x64', 'arm64'], |       arch: ['x64', 'arm64'], | ||||||
|       config: { |       config: { | ||||||
|         icon: "./images/app-icons/mac/icon.icns", |         icon: "./images/app-icons/icon.icns", | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
| @ -56,8 +55,7 @@ module.exports = { | |||||||
|       config: { |       config: { | ||||||
|         options: { |         options: { | ||||||
|           iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", |           iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", | ||||||
|           setupIcon: "./images/app-icons/icon.ico", |           icon: "./images/app-icons/icon.ico", | ||||||
|           loadingGif: "./images/app-icons/win/setup-banner.gif" |  | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Jin
						Jin