From 7e0e141273032c7afc1a9129512aa42c672fcf5d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 23 Aug 2018 17:36:06 +0300
Subject: Always serialize reference submit result manifest value if available
 and restructure handlers dir

---
 brep/submit/submit.bash.in | 197 ---------------------------------------------
 1 file changed, 197 deletions(-)
 delete mode 100644 brep/submit/submit.bash.in

(limited to 'brep/submit/submit.bash.in')

diff --git a/brep/submit/submit.bash.in b/brep/submit/submit.bash.in
deleted file mode 100644
index babf081..0000000
--- a/brep/submit/submit.bash.in
+++ /dev/null
@@ -1,197 +0,0 @@
-# file      : brep/submit/submit.bash.in
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Utility functions useful for implementing submission handlers.
-
-if [ "$brep_submit" ]; then
-  return 0
-else
-  brep_submit=true
-fi
-
-@import libbutl/manifest-parser@
-@import libbutl/manifest-serializer@
-
-# Diagnostics.
-#
-# We expect the user to set the verbose variable either to true or empty
-# (false).
-#
-if [ ! -v verbose ]; then
-  echo "error: variable 'verbose' is not set" >&2
-  exit 1
-fi
-
-# Normally the brep module's log record looks like this:
-#
-# [Mon Jul 23 17:48:46.945079 2018] [brep:error] [pid 123:tid 456] [brep::submit::init]: error description
-#
-# We will use the (almost) same format for our diagnostics (redirected to the
-# Apache's error_log), so it can easily be attributed to the brep module.
-#
-info_self="$(basename $0)"
-
-if [ "$#" -gt 0 ]; then
-  info_ref="$(basename "${!#/}")" # Last argument is the submission directory.
-fi
-
-function info () # <severity> <text>
-{
-  local severity="$1"
-  shift
-
-  # Note: %N is Linux-specific.
-  #
-  local ts
-  if ! ts="$(date +"%a %b %d %H:%M:%S.%6N %Y")"; then
-    ts=
-  fi
-
-  echo "[$ts] [brep:$severity] [ref $info_ref] [$info_self]: $*" 1>&2;
-}
-
-function error () { info "error" "$*"; exit 1; }
-
-function trace () { if [ "$verbose" ]; then info "info" "$*"; fi }
-
-# Trace a command line, quoting empty arguments as well as those that contain
-# spaces.
-#
-function trace_cmd () # <cmd> <arg>...
-{
-  if [ "$verbose" ]; then
-    local s="+"
-    while [ $# -gt 0 ]; do
-      if [ -z "$1" -o -z "${1##* *}" ]; then
-	s="$s '$1'"
-      else
-	s="$s $1"
-      fi
-
-      shift
-    done
-
-    info "info" "$s"
-  fi
-}
-
-# Trace the current function name and arguments.
-#
-function trace_func () # <args>...
-{
-  trace_cmd "${FUNCNAME[1]}" "$@"
-}
-
-# Trace and run a command.
-#
-function run () # <cmd> <arg>...
-{
-  trace_cmd "$@"
-  "$@"
-}
-
-# Same as above but also redirect the command stderr to /dev/null, unless
-# running in the verbose mode.
-#
-# Note that we don't redirect stdout, so it can still be captured.
-#
-function run_silent () # <cmd> <arg>...
-{
-  trace_cmd "$@"
-
-  if [ "$verbose" ]; then
-    "$@"
-  else
-    "$@" 2>/dev/null
-  fi
-}
-
-# Wrap libbutl manifest parsing/serializing functions to shorten names and to
-# add tracing.
-#
-function manifest_parser_start () # [<file>]
-{
-  trace_func "$@"
-  butl_manifest_parser_start "$@"
-
-  manifest_parser_ofd="$butl_manifest_parser_ofd"
-}
-
-function manifest_parser_finish ()
-{
-  trace_func
-  butl_manifest_parser_finish
-}
-
-function manifest_serializer_start () # [<file>]
-{
-  trace_func "$@"
-  butl_manifest_serializer_start "$@"
-
-  manifest_serializer_ifd="$butl_manifest_serializer_ifd"
-}
-
-function manifest_serializer_finish ()
-{
-  trace_func
-  butl_manifest_serializer_finish
-}
-
-# Serialize one manifest name/value pair.
-#
-function manifest_serialize () # <name> <value>
-{
-#  trace "$1: $2"
-  printf "%s:%s\0" "$1" "$2" >&"$manifest_serializer_ifd"
-}
-
-# Serialize the submission result manifest to stdout and exit the (sub-)shell
-# with the zero status.
-#
-function exit_with_manifest () # <status> <message> [<reference>]
-{
-  trace_func "$@"
-
-  local sts="$1"
-  local msg="$2"
-  local ref="$3"
-
-  manifest_serializer_start
-
-  manifest_serialize ""        "1"    # Start of manifest.
-  manifest_serialize "status"  "$sts"
-  manifest_serialize "message" "$msg"
-
-  if [ -n "$ref" ]; then
-    if [ "$sts" != "200" ]; then
-      error "reference for code $sts"
-    fi
-
-    manifest_serialize "reference" "$ref"
-  elif [ "$sts" == "200" ]; then
-    error "no reference for code $sts"
-  fi
-
-  manifest_serializer_finish
-  run exit 0
-}
-
-# Verify archive is a valid package and extract its manifest into
-# <manifest> file.
-#
-function extract_package_manifest () # <archive> <manifest>
-{
-  local arc="$1"
-  local man="$2"
-
-  if ! run_silent bpkg pkg-verify --manifest "$arc" >"$man"; then
-    # Perform the sanity check to make sure that bpkg is runnable.
-    #
-    if ! run bpkg --version >/dev/null; then
-      error "unable to run bpkg"
-    fi
-
-    exit_with_manifest 400 "archive is not a valid package (run bpkg pkg-verify for details)"
-  fi
-}
-- 
cgit v1.1