Launchpad itself

Merge ~cjwatson/launchpad:rename-cron-base-ppa into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. rename-cron-base-ppa
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ffe47737fae632c7d07e25605c0349c8431cf0ba
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:rename-cron-base-ppa
Merge into: launchpad:master
Diff against target: 38 lines (+2/-4)
3 files modified
cronscripts/publishing/cron.base-ppa.sh (+0/-2)
cronscripts/publishing/cron.daily-ppa (+1/-1)
cronscripts/publishing/cron.publish-ppa (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+417039@code.launchpad.net

Commit message

Rename cron.base-ppa to cron.base-ppa.sh

Description of the change

This causes https://github.com/pre-commit/identify to identify it as `shell` rather than as just a generic text file, which will shortly be useful for adding a `shellcheck` pre-commit hook.

I also removed the `#!` line from this file; since the file is non-executable and only ever processed by sourcing it into other shell scripts, there's no point in it having a `#!` line to tell the kernel how to execute it.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cronscripts/publishing/cron.base-ppa b/cronscripts/publishing/cron.base-ppa.sh
2similarity index 95%
3rename from cronscripts/publishing/cron.base-ppa
4rename to cronscripts/publishing/cron.base-ppa.sh
5index e89a912..f9d8d70 100644
6--- a/cronscripts/publishing/cron.base-ppa
7+++ b/cronscripts/publishing/cron.base-ppa.sh
8@@ -1,5 +1,3 @@
9-#!/bin/bash
10-#
11 # Copyright 2009 Canonical Ltd. This software is licensed under the
12 # GNU Affero General Public License version 3 (see the file LICENSE).
13
14diff --git a/cronscripts/publishing/cron.daily-ppa b/cronscripts/publishing/cron.daily-ppa
15index 9ec108f..20b1d74 100755
16--- a/cronscripts/publishing/cron.daily-ppa
17+++ b/cronscripts/publishing/cron.daily-ppa
18@@ -10,7 +10,7 @@ set -x
19 LOCKFILEOPTIONS="-r-1"
20
21 # Variables, lockfile and exit handler for PPA scripts.
22-source `dirname $0`/cron.base-ppa
23+source `dirname $0`/cron.base-ppa.sh
24
25 # Clear out empty and thus redundant dirs.
26 find $PPAROOT -type d -empty | xargs -r rmdir
27diff --git a/cronscripts/publishing/cron.publish-ppa b/cronscripts/publishing/cron.publish-ppa
28index 763f35a..81ed9b1 100755
29--- a/cronscripts/publishing/cron.publish-ppa
30+++ b/cronscripts/publishing/cron.publish-ppa
31@@ -6,7 +6,7 @@
32 set -x
33
34 # Variables, lockfile and exit handler for PPA scripts.
35-source `dirname $0`/cron.base-ppa
36+source `dirname $0`/cron.base-ppa.sh
37
38 LPCURRENT=`dirname $0`/../..
39

Subscribers

People subscribed via source and target branches

to status/vote changes: