Skip to content

fix #84 - executable_name validation check fails when cwd is different and executable_name is relative #85

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #84 - executable_name validation check fails when cwd is different and executable_name is relative #85

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
16 changes: 8 additions & 8 deletions assets/nix/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ if [ -x "$1" ] ; then
shift
fi

if [ -z "${executable_name}" ] || [ ! -x "${executable_name}" ]; then
echo "Please set executable_name to a valid name in a text editor or as the first command line parameter" 1>&2
exit 1
fi

# Use POSIX-compatible way to get the directory of the executable
a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BASEDIR=$(cd "$a" || exit; pwd -P)

Expand All @@ -123,16 +118,21 @@ abs_path() {
echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
}

real_executable_name="$(abs_path "$executable_name")"

if [ -z "${executable_name}" ] || [ ! -x "${real_executable_name}" ]; then
echo "Please set executable_name to a valid name in a text editor or as the first command line parameter" 1>&2
exit 1
fi

# Set executable path and the extension to use for the libdoorstop shared object
os_type="$(uname -s)"
case ${os_type} in
Linux*)
executable_path="$(abs_path "$executable_name")"
executable_path="$real_executable_name"
lib_extension="so"
;;
Darwin*)
real_executable_name="$(abs_path "$executable_name")"

# If we're not even an actual executable, check .app Info for actual executable
case $real_executable_name in
*.app/Contents/MacOS/*)
Expand Down