Address installer minor issues (Windows) (netdata#19122)

* fix_msis2: remove unused file * fix_msis2: Create empty directories ignored by WIX * fix_msis2: Add nano as default editor * fix_msis2: Add missing reference
thiagoftsm · Dec 4, 2024 · dcbcf71 · dcbcf71
1 parent 9e6f454
commit dcbcf71
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 43 deletions.
diff --git a/packaging/installer/package-windows.sh b/packaging/installer/package-windows.sh
diff --git a/packaging/windows/netdata.wxs.in b/packaging/windows/netdata.wxs.in
@@ -33,6 +33,11 @@
             <Feature Id="Main">
                 <ComponentGroupRef Id="NetdataComponents" />
                 <ComponentRef Id="NetdataVarCache" />
+                <ComponentRef Id="NetdataDevShm" />
+                <ComponentRef Id="NetdataDevMqueue" />
+                <ComponentRef Id="NetdataTmp" />
+                <ComponentRef Id="NetdataHome" />
+                <ComponentRef Id="NetdataRoot" />
                 <ComponentRef Id="NetdataVarLib" />
                 <ComponentGroupRef Id="WevtComponents" />
                 <ComponentRef Id="NetdataService" />
@@ -50,6 +55,16 @@
                     <Directory Id="ETCDIR" Name="etc">
                         <Directory Id="ETCDIRNETDATA" Name="netdata" />
                     </Directory>
+                    <Directory Id="DEVDIR" Name="dev">
+                        <Directory Id="DEVSHMDIR" Name="shm" />
+                        <Directory Id="DEVMQUEUEDIR" Name="mqueue" />
+                    </Directory>
+                    <Directory Id="TMPDIR" Name="tmp">
+                    </Directory>
+                    <Directory Id="HOMEDIR" Name="home">
+                    </Directory>
+                    <Directory Id="ROOTDIR" Name="root">
+                    </Directory>
                 </Directory>
             </StandardDirectory>
 
@@ -90,6 +105,26 @@
                 <CreateFolder />
             </Component>
 
+            <Component Id="NetdataDevShm" Directory="DEVSHMDIR" Guid="cbe39d53-a5c8-4375-9b25-e24df4d411be">
+                <CreateFolder />
+            </Component>
+
+            <Component Id="NetdataDevMqueue" Directory="DEVMQUEUEDIR" Guid="f119d45f-b4d4-4918-bf05-89ee88be951a">
+                <CreateFolder />
+            </Component>
+
+            <Component Id="NetdataTmp" Directory="TMPDIR" Guid="19247d2f-0f9d-4891-a3b0-ffc208d8d878">
+                <CreateFolder />
+            </Component>
+
+            <Component Id="NetdataHome" Directory="HOMEDIR" Guid="13056229-7734-45ac-a982-572fa99f8e72">
+                <CreateFolder />
+            </Component>
+
+            <Component Id="NetdataRoot" Directory="ROOTDIR" Guid="5f0b7def-c4e6-417a-a5ae-b6f9c4aff14e">
+                <CreateFolder />
+            </Component>
+
             <CustomAction Id="ClaimAgent" Directory="USRBINDIR" ExeCommand='[USRBINDIR]NetdataClaim.exe /T &quot;[TOKEN]&quot; /R &quot;[ROOMS]&quot; /U &quot;[URL]&quot; /I [INSECURE] /P &quot;[PROXY]&quot; /F &quot;[INSTALLFOLDER]etc\netdata\claim.conf&quot;' Execute="deferred" Return="ignore" Impersonate="no"/>
             <InstallExecuteSequence>
                 <Custom Action="ClaimAgent" After="InstallFiles" />

diff --git a/packaging/windows/package-windows.sh b/packaging/windows/package-windows.sh
@@ -42,3 +42,9 @@ tar -xf /msys2-latest.tar.zst -C /opt/netdata/ || exit 1
 cp -R /opt/netdata/msys64/* /opt/netdata/ || exit 1
 rm -rf /opt/netdata/msys64/
 ${GITHUB_ACTIONS+echo "::endgroup::"}
+
+${GITHUB_ACTIONS+echo "::group::Configure Editor"}
+if [ -f /opt/netdata/etc/profile ]; then
+    echo 'EDITOR="/usr/bin/nano.exe"' >> /opt/netdata/etc/profile
+fi
+${GITHUB_ACTIONS+echo "::endgroup::"}