From 5f8a13b59a95da290de6240deb79eeec7cc3c830 Mon Sep 17 00:00:00 2001 From: Valcho Nedelchev Date: Sat, 24 Jan 2015 12:35:42 +0000 Subject: [PATCH] Fix ca-functions include path --- bin/ca-create-cert | 4 ++-- bin/ca-init | 4 ++-- bin/ca-renew-cert | 4 ++-- bin/ca-revoke-cert | 4 ++-- lib/ca-functions | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/ca-create-cert b/bin/ca-create-cert index 22709de..5b1bcac 100755 --- a/bin/ca-create-cert +++ b/bin/ca-create-cert @@ -1,6 +1,6 @@ -#! /bin/bash +#!/bin/bash -. "/home/alex/code/ca-scripts/lib/ca-functions" +source $(dirname $(dirname $0))/lib/ca-functions ALT_NAMES=() QUALIFY=1 diff --git a/bin/ca-init b/bin/ca-init index 3b30454..fa2204c 100755 --- a/bin/ca-init +++ b/bin/ca-init @@ -1,6 +1,6 @@ -#! /bin/bash +#!/bin/bash -. "/home/alex/code/ca-scripts/lib/ca-functions" +source $(dirname $(dirname $0))/lib/ca-functions # XXX: Add an interactive mode to this script to obviate the need for a # pre-existing config file? e.g. diff --git a/bin/ca-renew-cert b/bin/ca-renew-cert index fdbc9dd..868b8db 100755 --- a/bin/ca-renew-cert +++ b/bin/ca-renew-cert @@ -1,6 +1,6 @@ -#! /bin/bash +#!/bin/bash -. "/home/alex/code/ca-scripts/lib/ca-functions" +source $(dirname $(dirname $0))/lib/ca-functions usage() { cat <<__EOT__ diff --git a/bin/ca-revoke-cert b/bin/ca-revoke-cert index 38815c5..3dbd1ab 100755 --- a/bin/ca-revoke-cert +++ b/bin/ca-revoke-cert @@ -1,6 +1,6 @@ -#! /bin/sh +#!/bin/sh -. "/home/alex/code/ca-scripts/lib/ca-functions" +source $(dirname $(dirname $0))/lib/ca-functions usage() { cat <<__EOT__ diff --git a/lib/ca-functions b/lib/ca-functions index 90a106f..46e24ff 100644 --- a/lib/ca-functions +++ b/lib/ca-functions @@ -1,9 +1,9 @@ -#! /bin/bash -# common functions for ca-scripts +#!/bin/bash +# Common functions for ca-scripts. PROGNAME=$( basename $0 ) CONFFILE="/etc/ca-scripts.conf" -SHAREDIR="/home/alex/code/ca-scripts/tpl" +SHAREDIR=$(dirname $(dirname $0))/tpl CRYPTKEY="-nodes" INDEXTPL="index-html"