mirror of
https://code.mensbeam.com/MensBeam/Arsse.git
synced 2024-12-22 13:12:41 +00:00
Hopefully fix some Debian problems
This commit is contained in:
parent
281760be71
commit
14d3cdfe58
4 changed files with 14 additions and 6 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -1,11 +1,12 @@
|
||||||
# Temporary files
|
# Temporary files
|
||||||
|
|
||||||
|
/temp/
|
||||||
/documentation/
|
/documentation/
|
||||||
/manual/
|
/manual/
|
||||||
/tests/coverage/
|
/tests/coverage/
|
||||||
/dist/arch/arsse
|
/dist/arch/arsse/
|
||||||
/dist/arch/src
|
/dist/arch/src/
|
||||||
/dist/arch/pkg
|
/dist/arch/pkg/
|
||||||
/arsse.db*
|
/arsse.db*
|
||||||
/config.php
|
/config.php
|
||||||
/.php_cs.cache
|
/.php_cs.cache
|
||||||
|
|
|
@ -254,7 +254,7 @@ class RoboFile extends \Robo\Tasks {
|
||||||
}
|
}
|
||||||
// start a task collection and create a temporary directory
|
// start a task collection and create a temporary directory
|
||||||
$t = $this->collectionBuilder();
|
$t = $this->collectionBuilder();
|
||||||
$dir = $t->tmpDir().\DIRECTORY_SEPARATOR;
|
$dir = $t->workDir(BASE."temp").\DIRECTORY_SEPARATOR;
|
||||||
$base = $dir."arsse-$version".\DIRECTORY_SEPARATOR;
|
$base = $dir."arsse-$version".\DIRECTORY_SEPARATOR;
|
||||||
// start by extracting the tarball
|
// start by extracting the tarball
|
||||||
$t->addCode(function() use ($tarball, $dir, $base) {
|
$t->addCode(function() use ($tarball, $dir, $base) {
|
||||||
|
@ -266,7 +266,7 @@ class RoboFile extends \Robo\Tasks {
|
||||||
$t->addTask($this->taskPack($dir."arsse_$version.orig.tar.gz")->addDir("arsse-$version", $base));
|
$t->addTask($this->taskPack($dir."arsse_$version.orig.tar.gz")->addDir("arsse-$version", $base));
|
||||||
// copy Debian files to lower down in the tree
|
// copy Debian files to lower down in the tree
|
||||||
$t->addTask($this->taskFilesystemStack()->mirror($base."dist/debian", $base."debian"));
|
$t->addTask($this->taskFilesystemStack()->mirror($base."dist/debian", $base."debian"));
|
||||||
$t->addTask($this->taskExec("deber")->dir($dir));
|
$t->addTask($this->taskExec("deber")->dir($base));
|
||||||
return $t->run();
|
return $t->run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
dist/arsse
vendored
2
dist/arsse
vendored
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/php
|
#! /usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
if (posix_geteuid() == 0) {
|
if (posix_geteuid() == 0) {
|
||||||
$info = posix_getpwnam("arsse");
|
$info = posix_getpwnam("arsse");
|
||||||
|
|
7
dist/debian/rules
vendored
7
dist/debian/rules
vendored
|
@ -4,3 +4,10 @@ DH_VERBOSE = 1
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@ --with systemd
|
dh $@ --with systemd
|
||||||
|
|
||||||
|
override_dh_install:
|
||||||
|
# Run the normal dh_install
|
||||||
|
dh_install
|
||||||
|
# Satisfy lintian's complaints about VCS control files
|
||||||
|
rm -f debian/arsse/vendor/**/.gitignore
|
||||||
|
rm -f debian/arsse/vendor/**/.gitattributes
|
||||||
|
|
Loading…
Reference in a new issue