From 0ef13e60b01975f23b9597f378704d3e19644ad5 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Sun, 21 Jul 2019 21:38:30 +0200
Subject: [PATCH] Libraries: Fix wrong paths to "Root" in the various
 install.sh scripts.

We were installing libraries into /Libraries/Root, rather than in /Root.
This made the ports system behave rather unpredictable, since I had old
versions of things in /Root and new versions of things in /Libraries/Root.
---
 Libraries/LibC/install.sh    | 27 +++++++++++++++------------
 Libraries/LibCore/install.sh |  9 ++++++---
 Libraries/LibDraw/install.sh |  7 +++++--
 Libraries/LibGUI/install.sh  |  9 ++++++---
 Libraries/LibM/install.sh    | 11 +++++++----
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/Libraries/LibC/install.sh b/Libraries/LibC/install.sh
index 8b78656ecf..c8f2e7aabe 100755
--- a/Libraries/LibC/install.sh
+++ b/Libraries/LibC/install.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/sys/
-mkdir -p ../Root/usr/include/netinet/
-mkdir -p ../Root/usr/include/arpa/
-mkdir -p ../Root/usr/lib/
-cp *.h ../Root/usr/include/
-cp sys/*.h ../Root/usr/include/sys/
-cp arpa/*.h ../Root/usr/include/arpa/
-cp netinet/*.h ../Root/usr/include/netinet/
-cp libc.a ../Root/usr/lib/
-cp crt0.o ../Root/usr/lib/
-cp crti.ao ../Root/usr/lib/crti.o
-cp crtn.ao ../Root/usr/lib/crtn.o
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/sys/
+mkdir -p $SERENITY_ROOT/Root/usr/include/netinet/
+mkdir -p $SERENITY_ROOT/Root/usr/include/arpa/
+mkdir -p $SERENITY_ROOT/Root/usr/lib/
+cp *.h $SERENITY_ROOT/Root/usr/include/
+cp sys/*.h $SERENITY_ROOT/Root/usr/include/sys/
+cp arpa/*.h $SERENITY_ROOT/Root/usr/include/arpa/
+cp netinet/*.h $SERENITY_ROOT/Root/usr/include/netinet/
+cp libc.a $SERENITY_ROOT/Root/usr/lib/
+cp crt0.o $SERENITY_ROOT/Root/usr/lib/
+cp crti.ao $SERENITY_ROOT/Root/usr/lib/crti.o
+cp crtn.ao $SERENITY_ROOT/Root/usr/lib/crtn.o
diff --git a/Libraries/LibCore/install.sh b/Libraries/LibCore/install.sh
index fedc4b73fb..b7cdd1bb73 100755
--- a/Libraries/LibCore/install.sh
+++ b/Libraries/LibCore/install.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
-mkdir -p ../Root/usr/include/LibCore/
-cp *.h ../Root/usr/include/LibCore/
-cp libcore.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibCore/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibCore/
+cp libcore.a $SERENITY_ROOT/Root/usr/lib/
diff --git a/Libraries/LibDraw/install.sh b/Libraries/LibDraw/install.sh
index 33f40e6870..bff1a7c8b8 100755
--- a/Libraries/LibDraw/install.sh
+++ b/Libraries/LibDraw/install.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/LibGfx/
-cp *.h ../Root/usr/include/LibGfx/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibGfx/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibGfx/
diff --git a/Libraries/LibGUI/install.sh b/Libraries/LibGUI/install.sh
index e3cf91fcd7..8b7833c51d 100755
--- a/Libraries/LibGUI/install.sh
+++ b/Libraries/LibGUI/install.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/LibGUI/
-cp *.h ../Root/usr/include/LibGUI/
-cp libgui.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibGUI/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibGUI/
+cp libgui.a $SERENITY_ROOT/Root/usr/lib/
diff --git a/Libraries/LibM/install.sh b/Libraries/LibM/install.sh
index 83c8f6e632..b74cecdd2c 100755
--- a/Libraries/LibM/install.sh
+++ b/Libraries/LibM/install.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/sys/
-mkdir -p ../Root/usr/lib/
-cp *.h ../Root/usr/include/
-cp libm.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/sys/
+mkdir -p $SERENITY_ROOT/Root/usr/lib/
+cp *.h $SERENITY_ROOT/Root/usr/include/
+cp libm.a $SERENITY_ROOT/Root/usr/lib/