1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00

Correct filename conflict

This commit is contained in:
J. King 2021-05-31 13:10:16 -04:00
parent 837895fd6a
commit 3cd3ac4a51
2 changed files with 9 additions and 8 deletions

View file

@ -476,7 +476,8 @@ class RoboFile extends \Robo\Tasks {
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/tmpfiles.conf", $dir."dist/debian/arsse.tmpfiles")); $t->addTask($this->taskFilesystemStack()->copy($dir."dist/tmpfiles.conf", $dir."dist/debian/arsse.tmpfiles"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse.tmpfiles")->regex('/(?<= )arsse(?= )/')->to("www-data")); $t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse.tmpfiles")->regex('/(?<= )arsse(?= )/')->to("www-data"));
// change the user reference in the executable file // change the user reference in the executable file
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/arsse", $dir."dist/debian/arsse")); $t->addTask($this->taskFilesystemStack()->mkdir($dir."dist/debian/bin"));
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/arsse", $dir."dist/debian/bin/arsse"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse")->from('posix_getpwnam("arsse"')->to('posix_getpwnam("www-data"')); $t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse")->from('posix_getpwnam("arsse"')->to('posix_getpwnam("www-data"'));
} }
} }

View file

@ -8,10 +8,10 @@ UPGRADING usr/share/arsse/
README.md usr/share/arsse/ README.md usr/share/arsse/
arsse.php usr/share/arsse/ arsse.php usr/share/arsse/
dist/debian/arsse usr/bin/ dist/debian/bin/arsse usr/bin/
manual usr/share/doc/arsse/ manual usr/share/doc/arsse/
dist/man/* usr/share/man/ dist/man/* usr/share/man/
dist/nginx etc/arsse/ dist/nginx etc/arsse/
dist/apache etc/arsse/ dist/apache etc/arsse/
dist/config.php etc/arsse dist/config.php etc/arsse
config.defaults.php etc/arsse/ config.defaults.php etc/arsse/