Skip to content

Fix paths in root-level deltacode scripts #163 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-esser merged 1 commit into from
Mar 16, 2021
Merged

Fix paths in root-level deltacode scripts #163 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deltacode
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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" "$@"
6 changes: 3 additions & 3 deletions deltacode.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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