Merge pull request #90 from WhitewaterFoundry/patches2

Patch Cycle 1.1.21 Take 2
WhitewaterFoundry · Oct 7, 2018 · db3c5bb · db3c5bb
2 parents 5c0a4de + 758150b
commit db3c5bb
Show file tree

Hide file tree

Showing 12 changed files with 286 additions and 733 deletions.
diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj
@@ -74,10 +74,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>DistroLauncher-Appx_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>DistroLauncher-Appx_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Auto</AppxBundle>
-    <PackageCertificateThumbprint>A0C8C23CC1F951B9DD8F056E719BDF880624EDEF</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>B925CD1CB477AD4E4E14A79631FA4BF7F44E17DF</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>

diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters
@@ -196,6 +196,7 @@
     <CustomBuild Include="$(targetname)" />
     <CustomBuild Include="$(targetname)" />
     <CustomBuild Include="$(targetname)" />
+    <CustomBuild Include="$(targetname)" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="MyDistro.appxmanifest" />

diff --git a/DistroLauncher-Appx/MyDistro.appxmanifest b/DistroLauncher-Appx/MyDistro.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp uap2 uap3 rescap desktop">
-  <Identity Name="WhitewaterFoundryLtd.Co.16571368D6CFF" Version="1.1.20.0" Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF" ProcessorArchitecture="x64" />
+  <Identity Name="WhitewaterFoundryLtd.Co.16571368D6CFF" Version="1.1.21.0" Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF" ProcessorArchitecture="x64" />
   <mp:PhoneIdentity PhoneProductId="cdaff79b-6e07-4f5f-93b0-df4e9588183d" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>WLinux</DisplayName>

diff --git a/LICENSE.md b/LICENSE.md
diff --git a/ShellIntegration/Install.reg b/ShellIntegration/Install.reg
diff --git a/ShellIntegration/Uninstall.reg b/ShellIntegration/Uninstall.reg
diff --git a/create-targz-x64.sh b/create-targz-x64.sh
@@ -40,10 +40,6 @@ sudo cp $BUILDIR/linux_files/local.conf $TMPDIR/$DIST/etc/fonts/local.conf
 sudo cp $BUILDIR/linux_files/helpme $TMPDIR/$DIST/etc/helpme
 sudo cp $BUILDIR/linux_files/setup $TMPDIR/$DIST/etc/setup
 
-sudo mkdir $TMPDIR/$DIST/opt/ShellIntegration
-sudo cp $BUILDIR/linux_files/ShellIntegration/Install.reg $TMPDIR/$DIST/opt/ShellIntegration/Install.reg
-sudo cp $BUILDIR/linux_files/ShellIntegration/Uninstall.reg $TMPDIR/$DIST/opt/ShellIntegration/Uninstall.reg
-
 #make helpme and setup executable
 sudo chroot $DIST chmod 755 /etc/helpme
 sudo chroot $DIST chmod 755 /etc/setup

diff --git a/linux_files/ShellIntegration/Install.reg b/linux_files/ShellIntegration/Install.reg
diff --git a/linux_files/ShellIntegration/Uninstall.reg b/linux_files/ShellIntegration/Uninstall.reg
diff --git a/linux_files/profile b/linux_files/profile
@@ -42,11 +42,15 @@ export DISPLAY=:0
 # enable external libgl 
 export LIBGL_ALWAYS_INDIRECT=1
 
-# speed up some GUI apps
+# speed up some GUI apps like gedit
 export NO_AT_BRIDGE=1
 
-# does .firstrun exist? if not, run setup and touch .firstrun
+# alias wlinux helper apps
+alias wlinux-setup='bash /etc/setup'
+alias wlinux-help='bash /etc/helpme'
+
+# does .firstrun exist? if not, mention wlinux-setup and touch .firstrun
 if [ ! -f ~/.firstrun ]; then
-    /bin/bash /etc/setup
+    echo "Welcome to WLinux. Type 'wlinux-setup' to run the setup tool. You will only see this message once."
     touch ~/.firstrun
 fi