From 0a4d5521e574d2c044d4de4e2615eb09cdf28ef1 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 20 Jul 2017 18:40:24 -0700 Subject: [PATCH] devops: Punt devops:full-status. --- src/devops/devops.pkg | 1 - src/devops/devops.scm | 28 ++++++++++------------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/devops/devops.pkg b/src/devops/devops.pkg index c04725aec..ab2a048c4 100644 --- a/src/devops/devops.pkg +++ b/src/devops/devops.pkg @@ -34,6 +34,5 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (files "devops") (export () devops:status - devops:full-status devops:release devops:build-status)) \ No newline at end of file diff --git a/src/devops/devops.scm b/src/devops/devops.scm index e1f7e865c..cd46a03ec 100644 --- a/src/devops/devops.scm +++ b/src/devops/devops.scm @@ -24,42 +24,34 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ;;; See devops.texi for complete details. -(define (devops:full-status) (status #t)) - -(define (devops:status) (status #f)) - -(define (status full?) +(define (devops:status) (let ((dirt (shell-lines "git status --porcelain --untracked-files=no"))) (if (file-exists? "src/runtime/version.scm") - (core-status full? dirt)) + (core-status dirt)) (let ((ps (plugins))) (if (pair? ps) - (for-each (lambda (p) (plugin-status p full? dirt)) ps) - (log "no plugins\n"))))) + (for-each (lambda (p) (plugin-status p dirt)) ps) + (log "No plugins defined.\n"))))) -(define (core-status full? dirt) +(define (core-status dirt) (let ((version (core-version)) (changed (core-changed-files))) (let ((lint (core-lint version changed dirt))) - (if (or (not (null? lint)) - full?) + (if (not (null? lint)) (begin (log "# "(project-name)" "version":\n") (write-lint lint) - (if full? - (write-changed-files changed))))))) + (write-changed-files changed)))))) -(define (plugin-status plugin full? dirt) +(define (plugin-status plugin dirt) (let ((changed (plugin-changed-files plugin))) (let ((lint (plugin-lint plugin changed dirt))) - (if (or (not (null? lint)) - full?) + (if (not (null? lint)) (let ((name (plugin-name plugin)) (vers (plugin-version plugin))) (log "# "name" "vers":\n") (write-lint lint) - (if full? - (write-changed-files changed))))))) + (write-changed-files changed))))))) (define (write-lint lint) (for-each (lambda (line) -- 2.25.1