valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'get-version-git-on-windows' of tsimmons/tt-rss into master

This commit is contained in:
fox 2020-03-03 05:36:22 +00:00 committed by Gogs
parent 8ad523fcec 569228a5df
commit da926067ab
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions.php
View File

@ -1889,9 +1889,7 @@
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
$root_dir = dirname(dirname(__FILE__)); $root_dir = dirname(dirname(__FILE__));
if ('\\' === DIRECTORY_SEPARATOR) { if (PHP_OS === "Darwin") {
$ttrss_version['version'] = "UNKNOWN (Unsupported, Windows)";
} else if (PHP_OS === "Darwin") {
$ttrss_version['version'] = "UNKNOWN (Unsupported, Darwin)"; $ttrss_version['version'] = "UNKNOWN (Unsupported, Darwin)";
} else if (file_exists("$root_dir/version_static.txt")) { } else if (file_exists("$root_dir/version_static.txt")) {
$ttrss_version['version'] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)"; $ttrss_version['version'] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
@ -1902,7 +1900,7 @@
$cwd = getcwd(); $cwd = getcwd();
chdir($root_dir); chdir($root_dir);
exec('git --no-pager log --pretty='.escapeshellarg('version: %ct %h').' -n1 HEAD 2>&1', $output, $rc); exec('git --no-pager log --pretty="version: %ct %h" -n1 HEAD 2>&1', $output, $rc);
chdir($cwd); chdir($cwd);
if (is_array($output) && count($output) > 0) { if (is_array($output) && count($output) > 0) {