From 3cd3ac4a519384a4c90d6a58ed8218c8498072d4 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Mon, 31 May 2021 13:10:16 -0400
Subject: [PATCH] Correct filename conflict

---
 RoboFile.php              |  3 ++-
 dist/debian/arsse.install | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/RoboFile.php b/RoboFile.php
index b48353e..9150cef 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -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->taskReplaceInFile($dir."dist/debian/arsse.tmpfiles")->regex('/(?<= )arsse(?= )/')->to("www-data"));
         // 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"'));        
     }
 }
diff --git a/dist/debian/arsse.install b/dist/debian/arsse.install
index c9f0f14..f7a16b9 100644
--- a/dist/debian/arsse.install
+++ b/dist/debian/arsse.install
@@ -8,10 +8,10 @@ UPGRADING usr/share/arsse/
 README.md usr/share/arsse/
 arsse.php usr/share/arsse/
 
-dist/debian/arsse   usr/bin/
-manual              usr/share/doc/arsse/
-dist/man/*          usr/share/man/
-dist/nginx          etc/arsse/
-dist/apache         etc/arsse/
-dist/config.php     etc/arsse
-config.defaults.php etc/arsse/
+dist/debian/bin/arsse usr/bin/
+manual                usr/share/doc/arsse/
+dist/man/*            usr/share/man/
+dist/nginx            etc/arsse/
+dist/apache           etc/arsse/
+dist/config.php       etc/arsse
+config.defaults.php   etc/arsse/