Merge branch 'master' of github.com:Eugeny/terminus

HACKING.md

@@ -10,14 +10,13 @@ First, install the dependencies:
 
 ```
 # macOS/Linux:
-sudo npm -g install yarn node-gyp
-yarn install
+npm install
 ./scripts/install-deps.js
 ./scripts/build-native.js
 
 # Windows:
-npm -g install yarn node-gyp windows-build-tools
-yarn install
+npm -g install windows-build-tools
+npm install
 node scripts\install-deps.js
 node scripts\build-native.js
 ```

build/mac/Info.plist

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en_US</string>
-	<key>CFBundleExecutable</key>
-	<string>ELEMENTS</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.syslink.elements</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${VERSION}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Elements Client</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>elements-client</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>619</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.8.0</string>
-	<key>LSUIElement</key>
-	<false/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Syslink GmbH. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>AtomApplication</string>
-</dict>
-</plist>

build/windows/build.wxs

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix RequiredVersion="3.6.2830.0" xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-     <Bundle Name="ELEMENTS" Version="$(var.Version)" Manufacturer="ELEMENTS.tv" UpgradeCode="508475fc-0e76-4cd1-8e98-6953023ba518"
-         HelpUrl="http://elements.tv"
-         Copyright="Copyright © 2016 ELEMENTS" IconSourceFile="build/icon.ico"
-         AboutUrl="http://elements.tv">
-
-         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-             <bal:WixStandardBootstrapperApplication
-                 LicenseUrl=""
-                 LogoFile="build\logo.png"
-                 ThemeFile="build\windows\wix-theme.xml"
-             />
-         </BootstrapperApplicationRef>
-
-         <Chain>
-             <MsiPackage
-                 Id="ClientMSI"
-                 Compressed="yes"
-                 ForcePerMachine="yes"
-                 SourceFile="dist\elements-app.msi"
-                 Vital="yes">
-             </MsiPackage>
-             <MsiPackage
-                 Id="DriverMSI"
-                 Compressed="yes"
-                 ForcePerMachine="yes"
-                 SourceFile="build/windows/ElementsDriver_x64.msi"
-                 Vital="yes">
-             </MsiPackage>
-         </Chain>
-     </Bundle>
-</Wix>

build/windows/elements.wxs

@@ -1,84 +0,0 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" UpgradeCode="37484543-5276-2386-5427-275941245342"
-            Name="ELEMENTS" Version="$(var.ProductVersion)" Manufacturer="ELEMENTS.tv" Language="1033">
-        <Package InstallerVersion="200"
-            Compressed="yes"
-            Comments="Windows Installer Package"
-            Platform="x64"
-            InstallScope="perMachine"
-            InstallPrivileges="elevated" />
-        <MajorUpgrade AllowDowngrades="yes" Schedule="afterInstallValidate" />
-        <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
-
-        <Feature Id="DefaultFeature" Level="1">
-            <ComponentRef Id="RegistryEntries" />
-            <ComponentRef Id="AppDir"/>
-            <ComponentRef Id="AvidSharedStorageAccess"/>
-            <ComponentRef Id="ApplicationShortcutDesktop"/>
-            <ComponentGroupRef Id="Files" />
-        </Feature>
-
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="DesktopFolder" Name="Desktop">
-                <Component Id="ApplicationShortcutDesktop" Guid="*">
-                    <Shortcut Id="ApplicationDesktopShortcut"
-                        Name="ELEMENTS"
-                        Description="ELEMENTS client app"
-                        Target="[INSTALLDIR]\\Elements.exe"
-                        WorkingDirectory="INSTALLDIR"/>
-                    <RemoveFolder Id="DesktopFolder" On="uninstall"/>
-                    <RegistryValue
-                        Root="HKCU"
-                        Key="Software\ELEMENTS"
-                        Name="installed"
-                        Type="integer"
-                        Value="1"
-                        KeyPath="yes"/>
-                </Component>
-            </Directory>
-            <Directory Id="ProgramFiles64Folder">
-                <Directory Id="ElementsDir" Name="ELEMENTS">
-                    <Directory Id="INSTALLDIR" Name="ELEMENTS Client">
-                        <Component Id="AppDir" Guid="284957a6-a462-4e34-babd-c17800f11054" Win64="yes">
-                            <CreateFolder />
-                            <!--RemoveFile Id="RemoveFilesFromAppDirectory" Name="*.*" On="uninstall" /-->
-                            <!--RemoveFolder Id="AppDir" On="uninstall"/-->
-                        </Component>
-                    </Directory>
-                </Directory>
-            </Directory>
-            <Component Id="RegistryEntries" Guid="572998d8-719e-4124-8fe6-6d4f8b855d7b">
-                <RegistryKey Root="HKLM"
-                     Key="system\currentcontrolset\services\AvidFs"
-                     Action="create">
-                     <RegistryValue Type="string" Name="Description" Value="AIFMRX" />
-                     <RegistryValue Type="string" Name="DisplayName" Value="AIFMRX" />
-                     <RegistryValue Type="integer" Name="ErrorControl" Value="1" />
-                     <RegistryValue Type="string" Name="Group" Value="Network" />
-                     <RegistryValue Type="string" Name="ImagePath" Value="System32\DRIVERS\aifmrx.sys" />
-                     <RegistryValue Type="integer" Name="Start" Value="1" />
-                     <RegistryValue Type="integer" Name="Type" Value="2" />
-                 </RegistryKey>
-                 <RegistryKey Root="HKLM"
-                      Key="system\currentcontrolset\services\AifMRx\NetworkProvider"
-                      Action="create">
-                      <RegistryValue Type="string" Name="DeviceName" Value="\Device\AvidFs" />
-                      <RegistryValue Type="string" Name="Name" Value="Interface Network" />
-                      <RegistryValue Type="string" Name="ProviderPath" Value="System32\aifmrxnp.dll" />
-                  </RegistryKey>
-                  <RegistryKey Root="HKLM"
-                       Key="system\CurrentControlSet\services\LanmanWorkstation\Parameters"
-                       Action="create">
-                       <RegistryValue Type="integer" Name="DisableLargeMtu" Value="0" KeyPath="yes" />
-                       <RegistryValue Type="integer" Name="DisableBandwidthThrottling" Value="1" />
-                       <RegistryValue Type="integer" Name="EnableWsd" Value="0" />
-                  </RegistryKey>
-            </Component>
-            <Directory Id="System64Folder" Name="SystemFolder">
-                <Component Id="AvidSharedStorageAccess" Guid="972c67f2-ee17-4b20-8939-b92cfa13fcf6" NeverOverwrite="yes" Win64="yes" Permanent="yes">
-                    <File Id="AvidSharedStorageAccess.dll" Source="build\windows\AvidSharedStorageAccess.dll" KeyPath="yes"/>
-                </Component>
-            </Directory>
-        </Directory>
-    </Product>
-</Wix>

build/windows/wix-theme.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
-    <Window Width="300" Height="360" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
-    <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
-    <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
-
-    <Image X="30" Y="30" Width="256" Height="60" ImageFile="logo.png" Visible="yes"/>
-
-    <Page Name="Help">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
-        <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
-        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
-    </Page>
-    <Page Name="Install">
-        <!--Hypertext Name="EulaHyperlink" X="11" Y="121" Width="-11" Height="51" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
-        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox-->
-        <Button Name="InstallButton" X="90" Y="-120" Width="120" Height="50" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
-        <Button Name="WelcomeCancelButton" X="110" Y="-80" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
-    </Page>
-    <Page Name="Options">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
-        <Text X="11" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
-        <Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
-        <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
-        <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
-        <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
-    </Page>
-    <Page Name="FilesInUse">
-      <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
-      <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
-      <Text Name="FilesInUseText"  X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
-
-      <Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
-      <Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
-
-      <Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
-      <Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
-    </Page>
-    <Page Name="Progress">
-        <Text X="30" Y="120" Width="-30" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
-        <Text X="30" Y="150" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="30" Y="200" Width="-30" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-        <Progressbar Name="OverallCalculatedProgressbar" X="30" Y="220" Width="-30" Height="20" />
-        <Button Name="ProgressCancelButton" X="110" Y="-40" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
-    </Page>
-    <Page Name="Modify">
-        <Text X="30" Y="110" Width="-30" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
-
-        <Button Name="UninstallButton" X="90" Y="-100" Width="120" Height="50" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
-        <Button Name="RepairButton" X="110" Y="-60" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.ModifyRepairButton)</Button>
-        <Button Name="ModifyCancelButton" X="110" Y="-30" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
-    </Page>
-    <Page Name="Success">
-        <Text Name="SuccessHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Success</Text>
-        <Text Name="SuccessInstallHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Installed successfully</Text>
-        <Text Name="SuccessRepairHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Repaired successfully</Text>
-        <Text Name="SuccessUninstallHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Uninstalled successfully</Text>
-
-        <Button Name="LaunchButton" X="90" Y="-100" Width="120" Height="50" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-        <Button Name="SuccessCancelButton" X="110" Y="-60" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
-    </Page>
-    <Page Name="Failure">
-        <Text Name="FailureHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-        <Text Name="FailureInstallHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Setup failed</Text>
-        <Text Name="FailureUninstallHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Uninstall failed</Text>
-        <Text Name="FailureRepairHeader" X="30" Y="110" Width="-30" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">Repair failed</Text>
-        <Hypertext Name="FailureLogFileLink" X="30" Y="145" Width="-30" Height="50" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="30" Y="195" Width="-30" Height="50" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-        <Text Name="FailureRestartText" X="-30" Y="255" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
-
-        <Button Name="FailureRestartButton" X="90" Y="-100" Width="120" Height="50" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
-        <Button Name="FailureCloseButton" X="110" Y="-60" Width="80" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
-    </Page>
-</Theme>

package.json

@@ -24,6 +24,7 @@
     "node-gyp": "^3.6.2",
     "node-sass": "^4.5.3",
     "npmlog": "4.1.0",
+    "npx": "^9.7.1",
     "pug": "2.0.0-beta11",
     "pug-html-loader": "1.0.9",
     "pug-loader": "2.3.0",
@@ -42,7 +43,8 @@
     "url-loader": "0.5.7",
     "val-loader": "0.5.0",
     "webpack": "^3.0.0",
-    "yaml-loader": "0.4.0"
+    "yaml-loader": "0.4.0",
+    "yarn": "^1.3.2"
   },
   "build": {
     "appId": "org.terminus",

scripts/install-deps.js

@@ -4,16 +4,19 @@ const path = require('path')
 const vars = require('./vars')
 const log = require('npmlog')
 
+const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
+const npx = `${localBinPath}/npx`;
+
 log.info('deps', 'app')
-sh.exec('yarn install')
+sh.exec(`${npx} yarn install`)
 
 sh.cd('app')
-sh.exec('yarn install')
+sh.exec(`${npx} yarn install`)
 sh.cd('..')
 
 vars.builtinPlugins.forEach(plugin => {
   log.info('deps', plugin)
   sh.cd(plugin)
-  sh.exec('yarn install')
+  sh.exec(`${npx} yarn install`)
   sh.cd('..')
 })