From 9a284ad3f75629dc3d5b5a026a9a2b3c76704bca Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin+git@viroteck.net>
Date: Tue, 28 May 2019 02:58:36 +0200
Subject: [PATCH] Move everything to a subdirectory

Also don't run cd for the initial git clone (DERP!), and other bash port fixes.
---
 Ports/.port_include.sh                             |  8 +++++++-
 Ports/{ => SDL2}/SDL2.sh                           |  2 +-
 Ports/{ => bash}/bash.sh                           | 14 +++++++-------
 .../configure-system.patch}                        |  0
 .../disable-locale.patch}                          |  0
 .../include-stdio.patch}                           |  0
 6 files changed, 15 insertions(+), 9 deletions(-)
 rename Ports/{ => SDL2}/SDL2.sh (89%)
 rename Ports/{ => bash}/bash.sh (62%)
 rename Ports/{.bash-serenity-system.patch => bash/configure-system.patch} (100%)
 rename Ports/{.bash-serenity-disable-locale.patch => bash/disable-locale.patch} (100%)
 rename Ports/{.bash-serenity-include-stdio.patch => bash/include-stdio.patch} (100%)

diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh
index c197bcd651..b96f045d60 100755
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@@ -25,12 +25,18 @@ function run_command() {
     echo "+ FINISHED: $@"
 }
 
+function run_command_nocd() {
+    echo "+ $@ (nocd)"
+    ("$@")
+    echo "+ FINISHED (nocd): $@"
+}
+
 function run_fetch_git() {
     if [ -d "$PORT_DIR/.git" ]; then
         run_command git fetch
         run_command git reset --hard FETCH_HEAD
     else
-        run_command git clone "$1" "$PORT_DIR"
+        run_command_nocd git clone "$1" "$PORT_DIR"
     fi
 }
 
diff --git a/Ports/SDL2.sh b/Ports/SDL2/SDL2.sh
similarity index 89%
rename from Ports/SDL2.sh
rename to Ports/SDL2/SDL2.sh
index 0e6b0a1c2e..239e44d58b 100755
--- a/Ports/SDL2.sh
+++ b/Ports/SDL2/SDL2.sh
@@ -12,4 +12,4 @@ function build() {
 function install() {
     run_make_install
 }
-source ./.port_include.sh
+source ../.port_include.sh
diff --git a/Ports/bash.sh b/Ports/bash/bash.sh
similarity index 62%
rename from Ports/bash.sh
rename to Ports/bash/bash.sh
index e978d23f75..802f94ed02 100755
--- a/Ports/bash.sh
+++ b/Ports/bash/bash.sh
@@ -6,25 +6,25 @@ function fetch() {
     run_fetch_git "https://git.savannah.gnu.org/git/bash.git"
 
     # Add serenity as a system for configure
-    run_patch .bash-serenity-system.patch -p1
+    run_patch configure-system.patch -p1
 
     # For some reason, the build fails due to FILE* being undefined without this.
     # This is probably a LibC bug, but work around it for now.
-    run_patch .bash-serenity-include-stdio.patch -p1
+    run_patch include-stdio.patch -p1
 
     # Locale calls crash right now. LibC bug, probably.
-    run_patch .bash-serenity-disable-locale.patch -p1
+    run_patch disable-locale.patch -p1
 }
 function configure() {
     run_configure_autotools --disable-nls --without-bash-malloc
 }
 function build() {
     # Avoid some broken cross compile tests...
-    run_command perl -p -i -e "s/GETCWD_BROKEN 1/GETCWD_BROKEN 0/" config.h
-    run_command perl -p -i -e "s/CAN_REDEFINE_GETENV 1/CAN_REDEFINE_GETENV 0/" config.h
+    run_command perl -p -i -e "s/define GETCWD_BROKEN 1/undef GETCWD_BROKEN/" config.h
+    run_command perl -p -i -e "s/define CAN_REDEFINE_GETENV 1/undef CAN_REDEFINE_GETENV/" config.h
     run_make
 }
 function install() {
-    run_make_install
+    run_make_install DESTDIR="$SERENITY_ROOT"/Root
 }
-source ./.port_include.sh
+source ../.port_include.sh
diff --git a/Ports/.bash-serenity-system.patch b/Ports/bash/configure-system.patch
similarity index 100%
rename from Ports/.bash-serenity-system.patch
rename to Ports/bash/configure-system.patch
diff --git a/Ports/.bash-serenity-disable-locale.patch b/Ports/bash/disable-locale.patch
similarity index 100%
rename from Ports/.bash-serenity-disable-locale.patch
rename to Ports/bash/disable-locale.patch
diff --git a/Ports/.bash-serenity-include-stdio.patch b/Ports/bash/include-stdio.patch
similarity index 100%
rename from Ports/.bash-serenity-include-stdio.patch
rename to Ports/bash/include-stdio.patch