From d5022ffb57247496d9190c6fcba94d74ed3e6fd2 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Sun, 17 Apr 2022 21:49:01 +0100
Subject: fixed bootstrap links

---
 bootstrap/stage1.sh      | 2 +-
 bootstrap/stage2.sh      | 2 +-
 xib_env                  | 2 +-
 xibuild/build_all.sh     | 2 +-
 xibuild/build_package.sh | 4 ++--
 xibuild/build_profile    | 3 ++-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bootstrap/stage1.sh b/bootstrap/stage1.sh
index 0453973..93585e2 100644
--- a/bootstrap/stage1.sh
+++ b/bootstrap/stage1.sh
@@ -35,7 +35,7 @@ cross_tools_binutils () {
 
 cross_tools_gcc_static () {
     cd ${WD}
-    src "https://www.mpfr.org/mpfr-$MPFR_VER/mpfr-$MPFR_VER.tar.xz"
+    src "https://ftp.gnu.org/gnu/mpfr/mpfr-$MPFR_VER.tar.xz"
     src "https://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.xz"
     src "https://ftp.gnu.org/gnu/mpc/mpc-$MPC_VER.tar.gz"
     src "https://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/gcc-$GCC_VER.tar.xz"
diff --git a/bootstrap/stage2.sh b/bootstrap/stage2.sh
index c8409b2..4925235 100644
--- a/bootstrap/stage2.sh
+++ b/bootstrap/stage2.sh
@@ -164,7 +164,7 @@ toolchain_binutils () {
 }
 
 toolchain_gcc () {
-    src "https://www.mpfr.org/mpfr-$MPFR_VER/mpfr-$MPFR_VER.tar.xz"
+    src "https://ftp.gnu.org/gnu/mpfr/mpfr-$MPFR_VER.tar.xz"
     src "https://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.xz"
     src "https://ftp.gnu.org/gnu/mpc/mpc-$MPC_VER.tar.gz"
     src "https://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/gcc-$GCC_VER.tar.xz"
diff --git a/xib_env b/xib_env
index 2b6418b..44cf70d 100755
--- a/xib_env
+++ b/xib_env
@@ -5,7 +5,7 @@ export INFOCHAR=" ~ "
 
 export MAKEFLAGS="-j$(grep "processor" /proc/cpuinfo | wc -l)"
 
-export XIB_DIR="/var/lib/xib"
+export XIB_DIR="/xilinux/var/lib/xib"
 export XIB_BUILDFILES="$XIB_DIR/buildfiles"
 export XIB_CHROOT="$XIB_DIR/chroot"
 export XIB_EXPORT="$XIB_DIR/export"
diff --git a/xibuild/build_all.sh b/xibuild/build_all.sh
index 755c528..a0adbbc 100755
--- a/xibuild/build_all.sh
+++ b/xibuild/build_all.sh
@@ -86,7 +86,7 @@ while true; do
         printf "${ERROR} Something went wrong!${NEUTRAL} Press enter to view recent log"
         read out;
 
-        less $(ls -1 --sort time $XIB_EXPORT/repo/*/*.log | head -1 | xargs realpath)
+        less $(ls -t1 $XIB_EXPORT/repo/*/*.log | head -1 | xargs realpath)
 
         read -p "Retry build? [Y/n]" response
         if [ "$response" = "n" ]; then
diff --git a/xibuild/build_package.sh b/xibuild/build_package.sh
index e09aecd..b430738 100755
--- a/xibuild/build_package.sh
+++ b/xibuild/build_package.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 GREEN="\033[0;32m"
 BLUE="\033[0;34m"
@@ -70,7 +70,7 @@ fetch_source () {
             extract $downloaded_file
 
             # if the extracted file only had one directory
-            if [ "$(ls -l | wc -l)" = "3" ]; then
+            if [ "$(ls -1 | wc -l)" = "2" ]; then
                 for file in */* */.*; do 
                     echo $file | grep -q '\.$' || mv $file .
                 done;
diff --git a/xibuild/build_profile b/xibuild/build_profile
index 0997928..04c2ceb 100644
--- a/xibuild/build_profile
+++ b/xibuild/build_profile
@@ -1,3 +1,5 @@
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin:/tools/sbin
+
 apply_patches () {
     for p in *.patch; do
         echo "Applying $p"
@@ -7,7 +9,6 @@ apply_patches () {
 
 export JOBS=$(grep "processor" /proc/cpuinfo | wc -l)
 export HOME=/root
-export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin
 
 export MAKEFLAGS="-j$JOBS"
 export XORG_PREFIX="/usr"
-- 
cgit v1.2.1