From 29c51ced3d57cf07fc437e42479c3bd079ba0de7 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Sep 26 2018 09:52:59 +0000
Subject: Mark keyhelper and aclchecker as executable


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/files/pagure.spec b/files/pagure.spec
index 7963cfe..3b26f43 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -237,8 +237,9 @@ install -p -m 644 createdb.py $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure_createdb
 install -p -m 644 files/api_key_expire_mail.py $RPM_BUILD_ROOT/%{_datadir}/pagure/api_key_expire_mail.py
 
 # Install the keyhelper and aclcheck scripts
-install -p -m 644 files/aclchecker.py $RPM_BUILD_ROOT/%{_datadir}/pagure/aclchecker.py
-install -p -m 644 files/keyhelper.py $RPM_BUILD_ROOT/%{_datadir}/pagure/keyhelper.py
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure/
+install -p -m 755 files/aclchecker.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/aclchecker.py
+install -p -m 755 files/keyhelper.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/keyhelper.py
 
 # Install the alembic configuration file
 install -p -m 644 files/alembic.ini $RPM_BUILD_ROOT/%{_sysconfdir}/pagure/alembic.ini
@@ -302,11 +303,11 @@ install -p -m 644 pagure-ev/pagure_ev.service \
 # Fix the shebang for various scripts
 sed -e "s|#!/usr/bin/env python|#!%{__python}|" -i \
     $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/pagure_stream_server.py \
+    $RPM_BUILD_ROOT/%{_libexecdir}/pagure/aclchecker.py \
+    $RPM_BUILD_ROOT/%{_libexecdir}/pagure/keyhelper.py \
     $RPM_BUILD_ROOT/%{_datadir}/pagure/comment_email_milter.py \
     $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure_createdb.py \
     $RPM_BUILD_ROOT/%{_datadir}/pagure/api_key_expire_mail.py \
-    $RPM_BUILD_ROOT/%{_datadir}/pagure/aclchecker.py \
-    $RPM_BUILD_ROOT/%{_datadir}/pagure/keyhelper.py \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/*.py \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/post-receive \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/pre-receive \
diff --git a/pagure/default_config.py b/pagure/default_config.py
index d31f143..fa15bce 100644
--- a/pagure/default_config.py
+++ b/pagure/default_config.py
@@ -513,7 +513,7 @@ SSH_KEYS_USERNAME_EXPECT = None
 # Arguments to add to the SSH keys, possible replacements:
 # %(username)s: username owning this key
 SSH_KEYS_OPTIONS = (
-    "restrict,command=/usr/libexec/pagure-aclchecker.py %(username)s"
+    "restrict,command=/usr/libexec/pagure/aclchecker.py %(username)s"
 )
 
 # ACL Checker options