diff --git a/Makefile.pythonscripts.am b/Makefile.pythonscripts.am index f9769d55e..b76c02b6c 100644 --- a/Makefile.pythonscripts.am +++ b/Makefile.pythonscripts.am @@ -1,6 +1,6 @@ # special handling of Python scripts with auto-generated shebang line $(PYTHON_SHEBANG):%: %.in Makefile - $(AM_V_GEN)sed -e 's|@PYTHONSHEBANG[@]|#!$(PYTHON) -E|g' $< > $@ + $(AM_V_GEN)sed -e 's|^#!/usr/bin/python3.*|#!$(PYTHON) -E|g' $< > $@ $(AM_V_GEN)chmod +x $@ .PHONY: python_scripts_sub diff --git a/client/ipa-certupdate.in b/client/ipa-certupdate.in index d4734c7ad..7bb9ad530 100644 --- a/client/ipa-certupdate.in +++ b/client/ipa-certupdate.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Jan Cholasta # # Copyright (C) 2014 Red Hat diff --git a/client/ipa-client-automount.in b/client/ipa-client-automount.in old mode 100755 new mode 100644 index c5f000e37..beece5c2d --- a/client/ipa-client-automount.in +++ b/client/ipa-client-automount.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/client/ipa-client-install.in b/client/ipa-client-install.in index 3cfd6ad0f..43a432182 100644 --- a/client/ipa-client-install.in +++ b/client/ipa-client-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Simo Sorce # Karl MacMillan # diff --git a/daemons/dnssec/ipa-dnskeysync-replica.in b/daemons/dnssec/ipa-dnskeysync-replica.in index 927b07930..6783e30ea 100644 --- a/daemons/dnssec/ipa-dnskeysync-replica.in +++ b/daemons/dnssec/ipa-dnskeysync-replica.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/daemons/dnssec/ipa-dnskeysyncd.in b/daemons/dnssec/ipa-dnskeysyncd.in index dcd8b18eb..418bf73e2 100644 --- a/daemons/dnssec/ipa-dnskeysyncd.in +++ b/daemons/dnssec/ipa-dnskeysyncd.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/daemons/dnssec/ipa-ods-exporter.in b/daemons/dnssec/ipa-ods-exporter.in index ffa2d403c..7c0553999 100644 --- a/daemons/dnssec/ipa-ods-exporter.in +++ b/daemons/dnssec/ipa-ods-exporter.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit.in b/install/certmonger/dogtag-ipa-ca-renew-agent-submit.in index ceb6f9b1e..d4d4c255a 100644 --- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit.in +++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Jan Cholasta diff --git a/install/certmonger/ipa-server-guard.in b/install/certmonger/ipa-server-guard.in index 33c1601c0..db6a1157e 100644 --- a/install/certmonger/ipa-server-guard.in +++ b/install/certmonger/ipa-server-guard.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Jan Cholasta diff --git a/install/custodia/ipa-custodia-dmldap.in b/install/custodia/ipa-custodia-dmldap.in index 8cf2411a8..02163763d 100644 --- a/install/custodia/ipa-custodia-dmldap.in +++ b/install/custodia/ipa-custodia-dmldap.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 IPA Project Contributors, see COPYING for license # diff --git a/install/custodia/ipa-custodia-pki-tomcat-wrapped.in b/install/custodia/ipa-custodia-pki-tomcat-wrapped.in index 26abac471..1a29d75f9 100644 --- a/install/custodia/ipa-custodia-pki-tomcat-wrapped.in +++ b/install/custodia/ipa-custodia-pki-tomcat-wrapped.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 IPA Project Contributors, see COPYING for license # diff --git a/install/custodia/ipa-custodia-pki-tomcat.in b/install/custodia/ipa-custodia-pki-tomcat.in index 5bf51c81a..7b144f0d4 100644 --- a/install/custodia/ipa-custodia-pki-tomcat.in +++ b/install/custodia/ipa-custodia-pki-tomcat.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 IPA Project Contributors, see COPYING for license # diff --git a/install/custodia/ipa-custodia-ra-agent.in b/install/custodia/ipa-custodia-ra-agent.in index 8cade0260..b950bc2e5 100644 --- a/install/custodia/ipa-custodia-ra-agent.in +++ b/install/custodia/ipa-custodia-ra-agent.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 IPA Project Contributors, see COPYING for license # diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains.in b/install/oddjob/com.redhat.idm.trust-fetch-domains.in index 58ec5fe77..dc96ecef1 100644 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains.in +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 from ipaserver import dcerpc from ipaserver.install.installutils import is_ipa_configured, ScriptError diff --git a/install/restart_scripts/renew_ca_cert.in b/install/restart_scripts/renew_ca_cert.in index 0bb0482a3..6d1ae6253 100644 --- a/install/restart_scripts/renew_ca_cert.in +++ b/install/restart_scripts/renew_ca_cert.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/renew_kdc_cert.in b/install/restart_scripts/renew_kdc_cert.in index eeeaf8a0c..af620f4b3 100644 --- a/install/restart_scripts/renew_kdc_cert.in +++ b/install/restart_scripts/renew_kdc_cert.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2017 FreeIPA Contributors see COPYING for license # diff --git a/install/restart_scripts/renew_ra_cert.in b/install/restart_scripts/renew_ra_cert.in index ed06f62ac..2a0416d21 100644 --- a/install/restart_scripts/renew_ra_cert.in +++ b/install/restart_scripts/renew_ra_cert.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/renew_ra_cert_pre.in b/install/restart_scripts/renew_ra_cert_pre.in index 6cfe144de..633507f31 100644 --- a/install/restart_scripts/renew_ra_cert_pre.in +++ b/install/restart_scripts/renew_ra_cert_pre.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # diff --git a/install/restart_scripts/restart_dirsrv.in b/install/restart_scripts/restart_dirsrv.in index 55a056abc..77c2409a3 100644 --- a/install/restart_scripts/restart_dirsrv.in +++ b/install/restart_scripts/restart_dirsrv.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/restart_httpd.in b/install/restart_scripts/restart_httpd.in index 47cc27693..f8cad2243 100644 --- a/install/restart_scripts/restart_httpd.in +++ b/install/restart_scripts/restart_httpd.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/stop_pkicad.in b/install/restart_scripts/stop_pkicad.in index d495afceb..a51c31226 100644 --- a/install/restart_scripts/stop_pkicad.in +++ b/install/restart_scripts/stop_pkicad.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: # Rob Crittenden diff --git a/install/tools/ipa-adtrust-install.in b/install/tools/ipa-adtrust-install.in index d9ae833a3..1abfea975 100644 --- a/install/tools/ipa-adtrust-install.in +++ b/install/tools/ipa-adtrust-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Authors: Sumit Bose # Based on ipa-server-install by Karl MacMillan diff --git a/install/tools/ipa-advise.in b/install/tools/ipa-advise.in index 7018041c3..1e7926796 100644 --- a/install/tools/ipa-advise.in +++ b/install/tools/ipa-advise.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Tomas Babej # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-backup.in b/install/tools/ipa-backup.in index 2511d7444..c0fe205b2 100644 --- a/install/tools/ipa-backup.in +++ b/install/tools/ipa-backup.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-ca-install.in b/install/tools/ipa-ca-install.in index 5307adfef..0700c0c38 100644 --- a/install/tools/ipa-ca-install.in +++ b/install/tools/ipa-ca-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-cacert-manage.in b/install/tools/ipa-cacert-manage.in index 791fefd90..da8c7bfbc 100644 --- a/install/tools/ipa-cacert-manage.in +++ b/install/tools/ipa-cacert-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Jan Cholasta # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-cert-fix.in b/install/tools/ipa-cert-fix.in old mode 100755 new mode 100644 index c35991843..7e4503872 --- a/install/tools/ipa-cert-fix.in +++ b/install/tools/ipa-cert-fix.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-compat-manage.in b/install/tools/ipa-compat-manage.in index 5eee9e8f7..f338a6970 100644 --- a/install/tools/ipa-compat-manage.in +++ b/install/tools/ipa-compat-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # Authors: Simo Sorce # diff --git a/install/tools/ipa-crlgen-manage.in b/install/tools/ipa-crlgen-manage.in index 5d895ab7f..bbeab368e 100644 --- a/install/tools/ipa-crlgen-manage.in +++ b/install/tools/ipa-crlgen-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2019 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-csreplica-manage.in b/install/tools/ipa-csreplica-manage.in index 0822deb15..d61205433 100644 --- a/install/tools/ipa-csreplica-manage.in +++ b/install/tools/ipa-csreplica-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # # Based on ipa-replica-manage by Karl MacMillan diff --git a/install/tools/ipa-custodia-check.in b/install/tools/ipa-custodia-check.in index 3a30830f4..b496ef387 100644 --- a/install/tools/ipa-custodia-check.in +++ b/install/tools/ipa-custodia-check.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 """Test client for ipa-custodia The test script is expected to be executed on an IPA server with existing diff --git a/install/tools/ipa-custodia.in b/install/tools/ipa-custodia.in index aaee7300d..8a112e2c5 100644 --- a/install/tools/ipa-custodia.in +++ b/install/tools/ipa-custodia.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Copyright (C) 2017 IPA Project Contributors, see COPYING for license from ipaserver.secrets.service import main diff --git a/install/tools/ipa-dns-install.in b/install/tools/ipa-dns-install.in index 99260fe97..43e2be88a 100644 --- a/install/tools/ipa-dns-install.in +++ b/install/tools/ipa-dns-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Martin Nagy # Based on ipa-server-install by Karl MacMillan # diff --git a/install/tools/ipa-httpd-kdcproxy.in b/install/tools/ipa-httpd-kdcproxy.in index 539b7f1e4..49c473e2e 100644 --- a/install/tools/ipa-httpd-kdcproxy.in +++ b/install/tools/ipa-httpd-kdcproxy.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: # Christian Heimes # diff --git a/install/tools/ipa-kra-install.in b/install/tools/ipa-kra-install.in index 831bb0efe..95d6c1360 100644 --- a/install/tools/ipa-kra-install.in +++ b/install/tools/ipa-kra-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Ade Lee # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-ldap-updater.in b/install/tools/ipa-ldap-updater.in index ad54d5614..b34178159 100644 --- a/install/tools/ipa-ldap-updater.in +++ b/install/tools/ipa-ldap-updater.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # # Copyright (C) 2008 Red Hat diff --git a/install/tools/ipa-managed-entries.in b/install/tools/ipa-managed-entries.in index d0f06bf6d..e9be41b7a 100644 --- a/install/tools/ipa-managed-entries.in +++ b/install/tools/ipa-managed-entries.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Jr Aquino # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-nis-manage.in b/install/tools/ipa-nis-manage.in index ac53744a1..dbac9cb09 100644 --- a/install/tools/ipa-nis-manage.in +++ b/install/tools/ipa-nis-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # Authors: Simo Sorce # diff --git a/install/tools/ipa-otptoken-import.in b/install/tools/ipa-otptoken-import.in index ef29e0abf..70ace6dea 100644 --- a/install/tools/ipa-otptoken-import.in +++ b/install/tools/ipa-otptoken-import.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Nathaniel McCallum # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-pki-retrieve-key.in b/install/tools/ipa-pki-retrieve-key.in index 2ed2e59b5..46346483a 100644 --- a/install/tools/ipa-pki-retrieve-key.in +++ b/install/tools/ipa-pki-retrieve-key.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 from __future__ import print_function diff --git a/install/tools/ipa-pki-wait-running.in b/install/tools/ipa-pki-wait-running.in index 8b710cee0..7fab309f0 100644 --- a/install/tools/ipa-pki-wait-running.in +++ b/install/tools/ipa-pki-wait-running.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 """Wait until pki-tomcatd is up The script polls on Dogtag's HTTP port and wait until the admin interface diff --git a/install/tools/ipa-pkinit-manage.in b/install/tools/ipa-pkinit-manage.in index 44493a3f0..de8b4d41b 100644 --- a/install/tools/ipa-pkinit-manage.in +++ b/install/tools/ipa-pkinit-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2017 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-replica-conncheck.in b/install/tools/ipa-replica-conncheck.in index 5cb14c7dc..92080760f 100644 --- a/install/tools/ipa-replica-conncheck.in +++ b/install/tools/ipa-replica-conncheck.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Martin Kosek # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-replica-install.in b/install/tools/ipa-replica-install.in index 4c7f41325..f5a6d2ca6 100644 --- a/install/tools/ipa-replica-install.in +++ b/install/tools/ipa-replica-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Karl MacMillan # # Copyright (C) 2007 Red Hat diff --git a/install/tools/ipa-replica-manage.in b/install/tools/ipa-replica-manage.in index a289b5fb9..a276239fb 100644 --- a/install/tools/ipa-replica-manage.in +++ b/install/tools/ipa-replica-manage.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Karl MacMillan # # Copyright (C) 2007 Red Hat diff --git a/install/tools/ipa-restore.in b/install/tools/ipa-restore.in index 34d912bdb..80affa129 100644 --- a/install/tools/ipa-restore.in +++ b/install/tools/ipa-restore.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Rob Crittenden # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-server-certinstall.in b/install/tools/ipa-server-certinstall.in index b461bc7d2..dce5fe59d 100644 --- a/install/tools/ipa-server-certinstall.in +++ b/install/tools/ipa-server-certinstall.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Jan Cholasta # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-server-install.in b/install/tools/ipa-server-install.in index a8f706ff0..97bbddc7d 100644 --- a/install/tools/ipa-server-install.in +++ b/install/tools/ipa-server-install.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Karl MacMillan # Simo Sorce # Rob Crittenden diff --git a/install/tools/ipa-server-upgrade.in b/install/tools/ipa-server-upgrade.in index 03a9c12fd..a3a36cd39 100644 --- a/install/tools/ipa-server-upgrade.in +++ b/install/tools/ipa-server-upgrade.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-winsync-migrate.in b/install/tools/ipa-winsync-migrate.in index c8ac19ffc..32b77ebb8 100644 --- a/install/tools/ipa-winsync-migrate.in +++ b/install/tools/ipa-winsync-migrate.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Tomas Babej # # Copyright (C) 2015 Red Hat diff --git a/install/tools/ipactl.in b/install/tools/ipactl.in index 52773e099..9323f4c69 100644 --- a/install/tools/ipactl.in +++ b/install/tools/ipactl.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: Simo Sorce # # Copyright (C) 2008-2010 Red Hat diff --git a/ipa.in b/ipa.in index 4cd1793f5..4d9498afc 100644 --- a/ipa.in +++ b/ipa.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: # Jason Gerard DeRose diff --git a/makeaci.in b/makeaci.in index 8840ccc53..47b237e25 100644 --- a/makeaci.in +++ b/makeaci.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: # Petr Viktorin # John Dennis diff --git a/makeapi.in b/makeapi.in index da7784c6f..e6c1d3ddb 100644 --- a/makeapi.in +++ b/makeapi.in @@ -1,4 +1,4 @@ -@PYTHONSHEBANG@ +#!/usr/bin/python3 # Authors: # Rob Crittenden # John Dennis