From patchwork Tue Jan 19 23:22:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bird, Tim" X-Patchwork-Id: 8065791 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF24B9F744 for ; Tue, 19 Jan 2016 23:22:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09B4420547 for ; Tue, 19 Jan 2016 23:22:43 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FA362052A for ; Tue, 19 Jan 2016 23:22:41 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 447F4C05; Tue, 19 Jan 2016 23:22:41 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 80430C05 for ; Tue, 19 Jan 2016 23:22:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from SELDSEGREL01.sonyericsson.com (seldsegrel01.sonyericsson.com [37.139.156.29]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 8B20F89 for ; Tue, 19 Jan 2016 23:22:39 +0000 (UTC) To: "ltsi-dev@lists.linuxfoundation.org" From: Tim Bird Message-ID: <569EC536.9020006@sonymobile.com> Date: Tue, 19 Jan 2016 15:22:30 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Cc: dmitry.cherkasov@cogentembedded.com Subject: [LTSI-dev] [PATCH] rename host script to remove extraneous 't' X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP The docker-create-containter.sh script has an extra 't' in the name. Fix this, and fix the README and install docs to match the name change. Signed-off-by: Tim Bird --- README | 2 +- docs/source/install.tex | 4 ++-- jta-host-scripts/docker-create-container.sh | 10 ++++++++++ jta-host-scripts/docker-create-containter.sh | 10 ---------- 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100755 jta-host-scripts/docker-create-container.sh delete mode 100755 jta-host-scripts/docker-create-containter.sh diff --git a/README b/README index c853f4d..8d50828 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ Running -------------------------------------------------------------------------------- Issue the following commands from top directory: -jta-host-scripts/docker-create-containter.sh +jta-host-scripts/docker-create-container.sh jta-host-scripts/docker-start-container.sh Web interface will be available at http://localhost:8080 diff --git a/docs/source/install.tex b/docs/source/install.tex index 9a89849..ccfa1ad 100644 --- a/docs/source/install.tex +++ b/docs/source/install.tex @@ -13,8 +13,8 @@ Simply run install.sh script. It will create a docker image with JTA installed. When it's done you should create and start a docker container running the following commands from top directory: \begin{itemize} -\item \texttt{jta-host-scripts/docker-create-containter.sh}. -\item \texttt{jta-host-scripts/docker-start-containter.sh}. +\item \texttt{jta-host-scripts/docker-create-container.sh}. +\item \texttt{jta-host-scripts/docker-start-container.sh}. \end{itemize} When container is started, JTA web interface will be available on local machine at port \href{http://localhost:8080}{8080}. diff --git a/jta-host-scripts/docker-create-container.sh b/jta-host-scripts/docker-create-container.sh new file mode 100755 index 0000000..17c3e8c --- /dev/null +++ b/jta-host-scripts/docker-create-container.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta diff --git a/jta-host-scripts/docker-create-containter.sh b/jta-host-scripts/docker-create-containter.sh deleted file mode 100755 index 17c3e8c..0000000 --- a/jta-host-scripts/docker-create-containter.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - -sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta