From 6c83f606da14cb8b7e58495a551b93c970482b1d Mon Sep 17 00:00:00 2001
From: Tom Limoncelli <tlimoncelli@stackoverflow.com>
Date: Wed, 29 Apr 2020 19:46:13 -0400
Subject: [PATCH] Revert "Fix how `vcs_relative_path` first resolves an
 absolute path (#304)"

This reverts commit 87b7cd0eae68547d8e1ef2e72b1ce1d83e38fe05.
---
 bin/_blackbox_common.sh | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index a3939cb..b935f5d 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -366,22 +366,13 @@ function enumerate_blackbox_repos() {
   done
 }
 
-# Resolve the absolute path of a relative one
-# Adapted from https://unix.stackexchange.com/a/483514
-function abs() {
-  local _pwd bn
-  [ -d "${1}" ] && _pwd="${1}"
-  [ -f "${1}" ] && { _pwd=$(dirname "${1}") ;  bn=/$(basename "${1}") ;}
-  pushd "$_pwd" >/dev/null || exit
-  echo "$(pwd)${bn}"
-  popd >/dev/null || exit
-}
-
 # Output the path of a file relative to the repo base
 function vcs_relative_path() {
-  local name
-  name=$(abs "$1")
-  name="${name#$REPOBASE}"
+  # Usage: vcs_relative_path file
+  local name="$1"
+  #python -c 'import os ; print(os.path.relpath("'"$(pwd -P)"'/'"$name"'", "'"$REPOBASE"'"))'
+  local p=$( printf "%s" "$( pwd -P )/${1}" | sed 's#//*#/#g' )
+  local name="${p#$REPOBASE}"
   name=$( printf "%s" "$name" | sed 's#^/##g' | sed 's#/$##g' )
   printf "%s" "$name"
 }