diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2018-02-22 02:44:10 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2018-02-22 02:44:10 +0300 |
| commit | b565a2cd1d34afebcc7ec9ce6e29fee080f8e6c8 (patch) | |
| tree | 82d3feb9f005e4c1092d5d23c3228ed56f67bdf9 | |
| parent | ecc89476e66d6dce30b5ec536956a38394bb2ec6 (diff) | |
Backward compatibility with old kernels
| -rw-r--r-- | Properties/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | WorkerForm.cs | 12 | ||||
| -rw-r--r-- | hakchi_gui.csproj | 3 | ||||
| -rw-r--r-- | mods/mod_hakchi/hakchi/rootfs/etc/preinit | 1 | ||||
| -rw-r--r-- | mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb | 1 |
5 files changed, 18 insertions, 3 deletions
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 67a2a29e..fb184739 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ using System.Resources; // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.30.3")]
-[assembly: AssemblyFileVersion("2.0.30.3")]
+[assembly: AssemblyVersion("2.0.30.4")]
+[assembly: AssemblyFileVersion("2.0.30.4")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/WorkerForm.cs b/WorkerForm.cs index 7c796037..c12a7282 100644 --- a/WorkerForm.cs +++ b/WorkerForm.cs @@ -798,7 +798,17 @@ namespace com.clusterrr.hakchi_gui const string rootFsPath = "/var/lib/hakchi/rootfs";
var clovershell = MainForm.Clovershell;
- if (gameSyncStorage == null) gameSyncStorage = clovershell.ExecuteSimple($"hakchi findGameSyncStorage", 3000, true);
+ if (gameSyncStorage == null)
+ {
+ try
+ {
+ gameSyncStorage = clovershell.ExecuteSimple($"hakchi findGameSyncStorage", 3000, true);
+ }
+ catch
+ {
+ gameSyncStorage = rootFsPath + originalGamesPath;
+ }
+ }
var storageDevice = clovershell.ExecuteSimple($"df {gameSyncStorage} | sed -n '2p' | awk '{{print $1}}'", 3000, true);
var storageStats = clovershell.ExecuteSimple($"df {storageDevice} | tail -n 1 | awk '{{ print $2 \" | \" $3 \" | \" $4 }}'", 3000, true).Split('|');
diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj index 0678daae..6d24358b 100644 --- a/hakchi_gui.csproj +++ b/hakchi_gui.csproj @@ -2385,6 +2385,9 @@ <Content Include="mods\mod_hakchi\hakchi\rootfs\etc\preinit.d\p0000_version">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="patches\1c3848c0-Illusion of Gaia %28U%29 [!].ips">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="Properties\app.manifest" />
<Content Include="user_mods\snes_custom_filters.hmod\canoe-custom-filters">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit b/mods/mod_hakchi/hakchi/rootfs/etc/preinit index 731ab4a8..5b9959bb 100644 --- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit +++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit @@ -55,5 +55,6 @@ script_init(){ preinit(){ source_base + mount_base source_parts "$preinit.d/p????_*" } diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb index 3abecd6f..6a5d60ca 100644 --- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb +++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb @@ -24,6 +24,7 @@ switchToUsbHost(){ } getUsbStorageIds(){ + [ -e "/dev/bus/usb" ]|| return 1 find "/dev/bus/usb" -type c | while read device do hexdump -n 1 -s 32 "$device" -C | grep -e '^00000020 08' && echo "$device" |