From 6de434d3af54555bc53b93cca6f99de773142c37 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Sun, 17 Mar 2013 00:41:39 +0100
Subject: nacl scripts: include common header and rename build_nacl.sh

Add a uniform header comment to the two scripts as present in
other scripts in this repository as well. Also rename build_nacl.sh
into nacl_build.sh to stay conform in naming. For this, also update
all mentions of build_nacl.sh to nacl_build.sh.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 curvetun/.gitignore    |  2 +-
 curvetun/build_nacl.sh | 46 ---------------------------------------------
 curvetun/nacl_build.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 curvetun/nacl_path.sh  | 14 +++++++++-----
 4 files changed, 61 insertions(+), 52 deletions(-)
 delete mode 100755 curvetun/build_nacl.sh
 create mode 100755 curvetun/nacl_build.sh

(limited to 'curvetun')

diff --git a/curvetun/.gitignore b/curvetun/.gitignore
index d834aa2..ad9d744 100644
--- a/curvetun/.gitignore
+++ b/curvetun/.gitignore
@@ -3,5 +3,5 @@
 !.gitignore
 !Makefile
 !abiname.c
-!build_nacl.sh
+!nacl_build.sh
 !nacl_path.sh
diff --git a/curvetun/build_nacl.sh b/curvetun/build_nacl.sh
deleted file mode 100755
index 7a97302..0000000
--- a/curvetun/build_nacl.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# netsniff-ng - the packet sniffing beast
-# By Emmanuel Roullit <emmanuel@netsniff-ng.org>
-# Copyright 2009, 2011 Emmanuel Roullit.
-# Subject to the GPL, version 2.
-
-cc="gcc"
-nacl_dir="/tmp"
-nacl_version="nacl-20110221"
-nacl_suffix="tar.bz2"
-nacl_base_url="http://hyperelliptic.org/nacl"
-nacl_path="$nacl_dir/$nacl_version.$nacl_suffix"
-nacl_build_dir="$1"
-
-if test -z "$nacl_build_dir"; then
-	echo "Please input the path where NaCl should be build"
-	exit 1
-fi
-
-if ! test -d "$nacl_build_dir"; then
-	mkdir "$nacl_build_dir"
-fi
-
-wget -O "$nacl_path" "$nacl_base_url/$nacl_version.$nacl_suffix"
-tar xjf "$nacl_path" -C "$nacl_build_dir"
-
-$cc -Wall -O2 ./abiname.c -o ./abiname
-arch="`./abiname`"
-shorthostname=$(hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]')
-
-echo "Building NaCl for arch $arch on host $shorthostname (grab a coffee, this takes a while) ..."
-
-cd "$nacl_build_dir"/"$nacl_version"
-./do
-cd - > /dev/null
-
-nacl_lib_path="$nacl_build_dir/$nacl_version/build/$shorthostname/lib/$arch"
-nacl_include_path="$nacl_build_dir/$nacl_version/build/$shorthostname/include/$arch"
-
-echo "NaCl lib path $nacl_lib_path"
-echo "NaCl include path $nacl_include_path"
-
-./nacl_path.sh "$nacl_include_path" "$nacl_lib_path"
-
-echo "Done!"
diff --git a/curvetun/nacl_build.sh b/curvetun/nacl_build.sh
new file mode 100755
index 0000000..df6027a
--- /dev/null
+++ b/curvetun/nacl_build.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# -*- coding: utf-8 -*-
+#
+# nacl_build.sh -- NaCl library build script
+#
+# Copyright (C) 2011 Daniel Borkmann <borkmann@redhat.com>
+# Copyright (C) 2009-2011 Emmanuel Roullit <emmanuel@netsniff-ng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+cc="gcc"
+nacl_dir="/tmp"
+nacl_version="nacl-20110221"
+nacl_suffix="tar.bz2"
+nacl_base_url="http://hyperelliptic.org/nacl"
+nacl_path="$nacl_dir/$nacl_version.$nacl_suffix"
+nacl_build_dir="$1"
+
+if test -z "$nacl_build_dir"; then
+	echo "Please input the path where NaCl should be build"
+	exit 1
+fi
+
+if ! test -d "$nacl_build_dir"; then
+	mkdir "$nacl_build_dir"
+fi
+
+wget -O "$nacl_path" "$nacl_base_url/$nacl_version.$nacl_suffix"
+tar xjf "$nacl_path" -C "$nacl_build_dir"
+
+$cc -Wall -O2 ./abiname.c -o ./abiname
+arch="`./abiname`"
+shorthostname=$(hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]')
+
+echo "Building NaCl for arch $arch on host $shorthostname (grab a coffee, this takes a while) ..."
+
+cd "$nacl_build_dir"/"$nacl_version"
+./do
+cd - > /dev/null
+
+nacl_lib_path="$nacl_build_dir/$nacl_version/build/$shorthostname/lib/$arch"
+nacl_include_path="$nacl_build_dir/$nacl_version/build/$shorthostname/include/$arch"
+
+echo "NaCl lib path $nacl_lib_path"
+echo "NaCl include path $nacl_include_path"
+
+./nacl_path.sh "$nacl_include_path" "$nacl_lib_path"
+
+echo "Done!"
diff --git a/curvetun/nacl_path.sh b/curvetun/nacl_path.sh
index 1afc6d2..9f492ba 100755
--- a/curvetun/nacl_path.sh
+++ b/curvetun/nacl_path.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
-
-# netsniff-ng - the packet sniffing beast
-# By Emmanuel Roullit <emmanuel@netsniff-ng.org>
-# Copyright 2009, 2011 Emmanuel Roullit.
-# Subject to the GPL, version 2.
+# -*- coding: utf-8 -*-
+#
+# nacl_path.sh -- NaCl path export script
+#
+# Copyright (C) 2009-2011 Emmanuel Roullit <emmanuel@netsniff-ng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
 
 nacl_include_path="$1"
 nacl_lib_path="$2"
-- 
cgit v1.2.3-54-g00ecf