From 1de045af070dc38bb3b7073b3f48527da90a1a98 Mon Sep 17 00:00:00 2001
From: Marco Cesarato <marco.cesarato@eniac.it>
Date: Thu, 12 Mar 2020 18:30:43 +0100
Subject: [PATCH] fix: directory with phar host prefix issue and partial revert
 of previuos commit

Closes 4
---
 README.md           |   2 +-
 dist/scanner        | Bin 643085 -> 643108 bytes
 dist/version        |   2 +-
 src/Application.php |   4 ++--
 src/index.php       |  16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index f853337..5e66bc0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # AMWSCAN - PHP Antimalware Scanner
 
-**Version:** 0.5.0.70 beta
+**Version:** 0.5.0.71 beta
 
 **Github:** https://github.com/marcocesarato/PHP-Antimalware-Scanner
 
diff --git a/dist/scanner b/dist/scanner
index 7240764aef22d7455d204dc1f842fb920f4da551..112eaa7436727b00b78b5ec35a7e5b3e39317be0 100644
GIT binary patch
delta 416
zcmeBOpuS{*`UY7kfy*ly82%Jw#ewMZZ9i-$>q<#50|h2~NU4J90x2bbkOCG71_o=F
zIghq6GJpXmkj%_WNv+T;$SAO7f|vrL)2v>(!W3}>6*=eU73b%qf|La~ft5{uD5VKD
zn^#&9OdCpTfaw@%1rWWtUYd2~bggbi{>i;ZBqqDa2~J;dhLd-Cv;(8e^a~Ri*(QI8
z6qx+{h|u&!os41}DVariiMgp7lR1uRG3zK8ZZ<r+RN2|FD7`c{HLnC@uevo?W?phm
zX-cYsI#9d}T@1;I$Vw+Gz7*DXNlnYl%Ph$R`T|{>TTWs+y4d8*mom-mFWcK+G6FFZ
z5HkZY3lOscF&hxGZ*PCek@ZX_!?dc0%gFm*w7BQ<Rs|8Z8duTTz~EzWck*=t023aQ
ACjbBd

delta 448
zcmZ3oK)rW?`UY7kfi)``7!np`#DVCZ$D6e$>q<#50|h2~NU4J90x2bbkOCG71_o=F
zIghq6GJpXmkj%_WNv+T;$SCk-f|vrL{R3G;VT!ncik$QFit}?)LCON0z{(~+l+py7
z%`2@4rVXVvz;ukX0*KyRFU`7=jZ<Gsi;Hvegd@^ST%6Mr9T*iDIVV4il%M?jh!DR*
zH5aD>5EP}BlosVFOx8ZCwRytnK*r6hjs+_*>FH1Y`$D2#Pv5a9y$ocrx;0m3UUE)p
zN~(goo<5R`&?JJxFjc#xre)@3mSh6Gfhp;hlbDVv>XMqDlvXNHoSayaUxX>$Jnv=u
zyqAnX%ml>DK+FQftU$~L#O&MWz2wMxCS&dExGds8+Lczr+y8g0Pdc?^fnh5!cp2QC
Ge4PNud6&BY

diff --git a/dist/version b/dist/version
index 0c991ac..24705e7 100644
--- a/dist/version
+++ b/dist/version
@@ -1 +1 @@
-0.5.0.70
\ No newline at end of file
+0.5.0.71
\ No newline at end of file
diff --git a/src/Application.php b/src/Application.php
index 858087d..736a31a 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -34,7 +34,7 @@ class Application
      *
      * @var string
      */
-    public static $VERSION = '0.5.0.70';
+    public static $VERSION = '0.5.0.71';
 
     /**
      * Root path.
@@ -1081,6 +1081,6 @@ private function convertToBytes($from)
      */
     public static function currentDirectory()
     {
-        return preg_replace('/^phar:\/\//i', '', __DIR__);
+        return dirname(preg_replace('/^phar:\/\//i', '', __DIR__), 1);
     }
 }
diff --git a/src/index.php b/src/index.php
index 7e95030..3408d24 100644
--- a/src/index.php
+++ b/src/index.php
@@ -2,14 +2,14 @@
 
 namespace marcocesarato\amwscan;
 
-include './Argument.php';
-include './Argv.php';
-include './Console.php';
-include './CSV.php';
-include './Definitions.php';
-include './Flag.php';
-include './Deobfuscator.php';
-include './Application.php';
+include 'Argument.php';
+include 'Argv.php';
+include 'Console.php';
+include 'CSV.php';
+include 'Definitions.php';
+include 'Flag.php';
+include 'Deobfuscator.php';
+include 'Application.php';
 
 $isCLI = (php_sapi_name() === 'cli');
 if (!$isCLI) {