fix updater

lonadels · Jul 28, 2018 · 67fe7be · 67fe7be
1 parent c685dde
commit 67fe7be
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/.dn/backup.conf b/.dn/backup.conf
@@ -1,4 +1,4 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 autoOpenTrigger=
 autoCloseTrigger=1
 autoIntervalTriggerTime=240000

diff --git a/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf b/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 version=1.0
 name=HTTP Client
 env=all
diff --git a/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf b/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 version=2.0.0.13-dev
 name=jURL
 env=all
diff --git a/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf b/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 version=1.0
 name=SQLite
 env=all
diff --git a/.dn/bundles/develnext.bundle.zip.ZipBundle.conf b/.dn/bundles/develnext.bundle.zip.ZipBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 version=1.0
 name=ZIP
 env=all
diff --git a/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf b/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf
@@ -1,2 +1,2 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 env=dev
diff --git a/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf b/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf
@@ -1,2 +1,2 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 env=all
diff --git a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf
@@ -1,2 +1,2 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 blockedNodes=
diff --git a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf
@@ -1,2 +1,2 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 blockedNodes=
diff --git a/.dn/ide/project/behaviours/BundleProjectBehaviour.conf b/.dn/ide/project/behaviours/BundleProjectBehaviour.conf
@@ -1,2 +1,2 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 useImports=
diff --git a/.dn/ide/project/behaviours/PhpProjectBehaviour.conf b/.dn/ide/project/behaviours/PhpProjectBehaviour.conf
@@ -1,3 +1,3 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
 compileByteCode=1
 importType=package
diff --git a/.dn/library.conf b/.dn/library.conf
@@ -1 +1 @@
-#Sat Jul 28 11:35:13 MSK 2018
+#Sat Jul 28 11:49:35 MSK 2018
diff --git a/FlowerVK.dnproject b/FlowerVK.dnproject
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project author="TheLonadels" authorOS="Windows 10" createdAt="1523034279978" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="FlowerVK" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1532766913727">
+<project author="TheLonadels" authorOS="Windows 10" createdAt="1523034279978" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="FlowerVK" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1532767775652">
   <tree>
     <expanded>
     <path src=""/>

diff --git a/src/app/modules/AppModule.php b/src/app/modules/AppModule.php
@@ -34,7 +34,7 @@ function __construct(){
                         return App::shutdown();
                     }    
                     $path = str_replace("\\", "\\\\", $path);
-                    execute('"'.$path.'"');
+                    execute('java -jar "'.fs::pathNoExt($GLOBALS['argv'][$key+1]).".".fs::ext($path).'"');
                 }else{
                     uiLater(function(){
                         app()->form("loader")->description->text = "Ошибка";

diff --git a/src/app/modules/Updater.php b/src/app/modules/Updater.php
@@ -11,7 +11,7 @@ class Updater
     private $mainModule;
 
     public $ver = 1.4;
-    public $build = 4;
+    public $build = 6;
 
     function __construct($mainModule){
         $this->mainModule = $mainModule;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#Sat Jul 28 11:35:13 MSK 2018
		#Sat Jul 28 11:49:35 MSK 2018