Skip to content

Commit

Permalink
Remove legacy staticperl.
Browse files Browse the repository at this point in the history
  • Loading branch information
ariselseng committed Jul 23, 2020
1 parent f094c2a commit 1e58112
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
3 changes: 2 additions & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<summary>Preview and show camera RAW files in Nextcloud/ownCloud</summary>
<description>
<![CDATA[This app will make previews of &quot;RAW&quot; files from cameras in Nextcloud/ownCloud.]]></description>
<version>0.7.4</version>
<version>0.7.5</version>
<licence>agpl</licence>
<author mail="ari@selseng.net" >Ari Selseng</author>
<namespace>CameraRawPreviews</namespace>
Expand All @@ -15,6 +15,7 @@
<category>multimedia</category>
<bugs>https://github.com/ariselseng/camerarawpreviews/issues</bugs>
<dependencies>
<command>perl</command>
<owncloud min-version="10" max-version="10"/>
<nextcloud min-version="15" max-version="19"/>
</dependencies>
Expand Down
Binary file removed bin/staticperl
Binary file not shown.
16 changes: 0 additions & 16 deletions lib/RawPreview.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,6 @@ private function getPerlExecutable()
return $perlBin;
}

//fallback to static vendored perl
if (php_uname("s") === "Linux" && substr(php_uname("m"), 0, 3) === 'x86') {
$perlBin = realpath(__DIR__ . '/../bin/staticperl');
$fallback_is_executable = is_executable($perlBin);

if (!$fallback_is_executable && is_writable($perlBin)) {
$fallback_is_executable = chmod($perlBin, 0744);
}

if ($fallback_is_executable) {
$this->logger->warning('You do not have perl globally installed. Using a deprecated built in perl.', ['app' => $this->appName]);
} else {
$perlBin = null;
}
}

if (!empty($perlBin)) {
return $perlBin;
}
Expand Down

0 comments on commit 1e58112

Please sign in to comment.