mirror of
				https://github.com/yggdrasil-network/yggdrasil-go.git
				synced 2025-11-04 03:05:07 +03:00 
			
		
		
		
	1. Corrected resources path RIVM-2
This commit is contained in:
		
							parent
							
								
									60de24365a
								
							
						
					
					
						commit
						68a5d63b9c
					
				
					 1 changed files with 12 additions and 9 deletions
				
			
		| 
						 | 
					@ -51,7 +51,11 @@ fi
 | 
				
			||||||
PKGNAME=$(sh contrib/semver/name.sh)
 | 
					PKGNAME=$(sh contrib/semver/name.sh)
 | 
				
			||||||
PKGVERSION=$(sh contrib/msi/msversion.sh --bare)
 | 
					PKGVERSION=$(sh contrib/msi/msversion.sh --bare)
 | 
				
			||||||
PKGVERSIONMS=$(echo $PKGVERSION | tr - .)
 | 
					PKGVERSIONMS=$(echo $PKGVERSION | tr - .)
 | 
				
			||||||
PKGUIFOLDER=contrib/ui/mesh-ui/ui
 | 
					PKGUIFOLDER=contrib/ui/mesh-ui/ui/
 | 
				
			||||||
 | 
					PKGWEBVIEWRESOURCESFOLDER="${PKGUIFOLDER}assets/"
 | 
				
			||||||
 | 
					PKGFONTSRESOURCESFOLDER="${PKGUIFOLDER}webfonts/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					${PKGUIFOLDER}index.html
 | 
				
			||||||
PKGLICENSEFILE=LICENSE.rtf
 | 
					PKGLICENSEFILE=LICENSE.rtf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#Build winres
 | 
					#Build winres
 | 
				
			||||||
| 
						 | 
					@ -166,7 +170,7 @@ cat > wix.xml << EOF
 | 
				
			||||||
                    Id="WebViewHtmlFile"
 | 
					                    Id="WebViewHtmlFile"
 | 
				
			||||||
                    Name="index.html"
 | 
					                    Name="index.html"
 | 
				
			||||||
                    DiskId="1"
 | 
					                    DiskId="1"
 | 
				
			||||||
                    Source="${PKGWEBVIEWFILE}" />
 | 
					                    Source="${PKGUIFOLDER}index.html" />
 | 
				
			||||||
            </Component>
 | 
					            </Component>
 | 
				
			||||||
          </Directory>
 | 
					          </Directory>
 | 
				
			||||||
          <Directory Id="AssetsFolder" Name="assets" >
 | 
					          <Directory Id="AssetsFolder" Name="assets" >
 | 
				
			||||||
| 
						 | 
					@ -175,18 +179,17 @@ cat > wix.xml << EOF
 | 
				
			||||||
                    Id="AllMinCssFile"
 | 
					                    Id="AllMinCssFile"
 | 
				
			||||||
                    Name="all.min.css"
 | 
					                    Name="all.min.css"
 | 
				
			||||||
                    DiskId="1"
 | 
					                    DiskId="1"
 | 
				
			||||||
                    Source="${PKGWEBVIEWFILE}" />
 | 
					                    Source="${PKGWEBVIEWRESOURCESFOLDER}all.min.css" />
 | 
				
			||||||
                  <File
 | 
					                  <File
 | 
				
			||||||
                    Id="BulmaswatchCssFile"
 | 
					                    Id="BulmaswatchCssFile"
 | 
				
			||||||
                    Name="bulmaswatch.min.css"
 | 
					                    Name="bulmaswatch.min.css"
 | 
				
			||||||
                    DiskId="1"
 | 
					                    DiskId="1"
 | 
				
			||||||
                    Source="${PKGWEBVIEWFILE}" />
 | 
					                    Source="${PKGWEBVIEWRESOURCESFOLDER}bulmaswatch.min.css" />
 | 
				
			||||||
                  <File
 | 
					                  <File
 | 
				
			||||||
                    Id="BulmaswatchCssMapFile"
 | 
					                    Id="BulmaswatchCssMapFile"
 | 
				
			||||||
                    Name="bulmaswatch.min.css.map"
 | 
					                    Name="bulmaswatch.min.css.map"
 | 
				
			||||||
                    DiskId="1"
 | 
					                    DiskId="1"
 | 
				
			||||||
                    Source="${PKGWEBVIEWFILE}" />
 | 
					                    Source="${PKGWEBVIEWRESOURCESFOLDER}bulmaswatch.min.css.map" />
 | 
				
			||||||
                    
 | 
					 | 
				
			||||||
            </Component>
 | 
					            </Component>
 | 
				
			||||||
          </Directory>
 | 
					          </Directory>
 | 
				
			||||||
          <Directory Id="WebfontsFolder" Name="webfonts" >
 | 
					          <Directory Id="WebfontsFolder" Name="webfonts" >
 | 
				
			||||||
| 
						 | 
					@ -195,7 +198,7 @@ cat > wix.xml << EOF
 | 
				
			||||||
                    Id="FontFile"
 | 
					                    Id="FontFile"
 | 
				
			||||||
                    Name="fa-solid-900.woff2"
 | 
					                    Name="fa-solid-900.woff2"
 | 
				
			||||||
                    DiskId="1"
 | 
					                    DiskId="1"
 | 
				
			||||||
                    Source="${PKGWEBVIEWFILE}" />
 | 
					                    Source="${PKGFONTSRESOURCESFOLDER}fa-solid-900.woff2" />
 | 
				
			||||||
            </Component>
 | 
					            </Component>
 | 
				
			||||||
          </Directory>
 | 
					          </Directory>
 | 
				
			||||||
          <Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
 | 
					          <Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
 | 
				
			||||||
| 
						 | 
					@ -325,13 +328,13 @@ cat > wix.xml << EOF
 | 
				
			||||||
             Name="RiV-mesh"
 | 
					             Name="RiV-mesh"
 | 
				
			||||||
             Description="RiV-mesh is IoT E2E encrypted network"
 | 
					             Description="RiV-mesh is IoT E2E encrypted network"
 | 
				
			||||||
             Directory="DesktopFolder"
 | 
					             Directory="DesktopFolder"
 | 
				
			||||||
             Target="[MeshInstallFolder]mesh-ui.exe -ui\index.html"
 | 
					             Target="[MeshInstallFolder]mesh-ui.exe ui\index.html"
 | 
				
			||||||
             WorkingDirectory="MeshInstallFolder"/>
 | 
					             WorkingDirectory="MeshInstallFolder"/>
 | 
				
			||||||
        <RegistryValue Root="HKCU" Key="Software\RiV-chain\RiV-mesh" Name="installed" Type="integer" Value="1" KeyPath="yes" />
 | 
					        <RegistryValue Root="HKCU" Key="Software\RiV-chain\RiV-mesh" Name="installed" Type="integer" Value="1" KeyPath="yes" />
 | 
				
			||||||
        <RegistryValue Id="MerAs.rst" Root="HKMU" Action="write"
 | 
					        <RegistryValue Id="MerAs.rst" Root="HKMU" Action="write"
 | 
				
			||||||
            Key="Software\Microsoft\Windows\CurrentVersion\Run"
 | 
					            Key="Software\Microsoft\Windows\CurrentVersion\Run"
 | 
				
			||||||
            Name="RiV-mesh client"
 | 
					            Name="RiV-mesh client"
 | 
				
			||||||
            Value="[MeshInstallFolder]mesh-ui.exe -ui\index.html"
 | 
					            Value="[MeshInstallFolder]mesh-ui.exe ui\index.html"
 | 
				
			||||||
            Type="string" />
 | 
					            Type="string" />
 | 
				
			||||||
        <Condition>ASSISTANCE_START_VIA_REGISTRY</Condition>
 | 
					        <Condition>ASSISTANCE_START_VIA_REGISTRY</Condition>
 | 
				
			||||||
     </Component>
 | 
					     </Component>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue