From 6aba023006a22f7bc50f21c3755a4246856ab0f4 Mon Sep 17 00:00:00 2001 From: Steven Esser Date: Mon, 15 Mar 2021 15:42:06 -0400 Subject: [PATCH] Fix paths in root-level deltacode scripts #163 Signed-off-by: Steven Esser --- deltacode | 8 ++++---- deltacode.bat | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deltacode b/deltacode index d7b6d3ec..13bf8dc9 100755 --- a/deltacode +++ b/deltacode @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved. +# Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved. # # A minimal shell wrapper to the CLI entry point fo DeltaCode @@ -100,15 +100,15 @@ _canonicalize_file_path() { } ################################################################################### -# Now run scancode proper +# Now run deltacode proper DELTACODE_BIN="$( realpath "${BASH_SOURCE[0]}" )" DELTACODE_ROOT_DIR="$( cd "$( dirname "${DELTACODE_BIN}" )" && pwd )" -DELTACODE_CONFIGURED_PYTHON="$DELTACODE_ROOT_DIR/bin/python" +DELTACODE_CONFIGURED_PYTHON="$DELTACODE_ROOT_DIR/tmp/bin/python" if [ ! -f "$DELTACODE_CONFIGURED_PYTHON" ]; then echo "* Configuring DeltaCode for first use..." CONFIGURE_QUIET=1 "$DELTACODE_ROOT_DIR/configure" etc/conf fi -"$DELTACODE_ROOT_DIR/bin/deltacode" "$@" +"$DELTACODE_ROOT_DIR/tmp/bin/deltacode" "$@" diff --git a/deltacode.bat b/deltacode.bat index b261603b..5856ca99 100644 --- a/deltacode.bat +++ b/deltacode.bat @@ -1,12 +1,12 @@ @echo OFF -@rem Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved. +@rem Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved. @rem A minimal shell wrapper to the CLI entry point set DELTACODE_ROOT_DIR=%~dp0 @rem Use a trailing space in the next line to set the variable to an empty string set DELTACODE_CMD_LINE_ARGS= -set DELTACODE_CONFIGURED_PYTHON=%DELTACODE_ROOT_DIR%\bin\python.exe +set DELTACODE_CONFIGURED_PYTHON=%DELTACODE_ROOT_DIR%\tmp\bin\python.exe @rem Collect all command line arguments in a variable :collectarg @@ -29,6 +29,6 @@ if %errorlevel% neq 0 ( ) :deltacode -"%DELTACODE_ROOT_DIR%\bin\deltacode" %DELTACODE_CMD_LINE_ARGS% +"%DELTACODE_ROOT_DIR%\tmp\bin\deltacode" %DELTACODE_CMD_LINE_ARGS% :EOS