summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2021-10-05 16:35:17 +0100
committerdavidovski <david@davidovski.xyz>2021-10-05 16:35:17 +0100
commitcdea2f67ae42d4220e19a555259b69a960925283 (patch)
treeb1cc697e6e0203b3ce02e15b8baa4f73f84e34c8
parent16e799786f34721e646e14a2b7e7ab3816137f1a (diff)
renamed
-rw-r--r--psibuilds/psibuild.psibuild10
-rwxr-xr-xxibuild (renamed from psibuild)40
-rw-r--r--xibuilds/bash.xibuild (renamed from psibuilds/bash.psibuild)0
-rw-r--r--xibuilds/bc.xibuild (renamed from psibuilds/bc.psibuild)0
-rw-r--r--xibuilds/binutils.xibuild (renamed from psibuilds/binutils.psibuild)0
-rw-r--r--xibuilds/bzip2.xibuild (renamed from psibuilds/bzip2.psibuild)0
-rw-r--r--xibuilds/dejagnu.xibuild (renamed from psibuilds/dejagnu.psibuild)0
-rw-r--r--xibuilds/expect.xibuild (renamed from psibuilds/expect.psibuild)0
-rw-r--r--xibuilds/file.xibuild (renamed from psibuilds/file.psibuild)0
-rw-r--r--xibuilds/flex.xibuild (renamed from psibuilds/flex.psibuild)0
-rw-r--r--xibuilds/gcc.xibuild (renamed from psibuilds/gcc.psibuild)0
-rw-r--r--xibuilds/glibc.xibuild (renamed from psibuilds/glibc.psibuild)0
-rw-r--r--xibuilds/gmp.xibuild (renamed from psibuilds/gmp.psibuild)0
-rw-r--r--xibuilds/iana-etc.xibuild (renamed from psibuilds/iana-etc.psibuild)0
-rw-r--r--xibuilds/m4.xibuild (renamed from psibuilds/m4.psibuild)0
-rw-r--r--xibuilds/readline.xibuild (renamed from psibuilds/readline.psibuild)0
-rw-r--r--xibuilds/tar.xibuild (renamed from psibuilds/tar.psibuild)0
-rw-r--r--xibuilds/tcl.xibuild (renamed from psibuilds/tcl.psibuild)0
-rw-r--r--xibuilds/xibuild.xibuild10
-rw-r--r--xibuilds/xz.xibuild (renamed from psibuilds/xz.psibuild)0
-rw-r--r--xibuilds/zlib.xibuild (renamed from psibuilds/zlib.psibuild)0
-rw-r--r--xibuilds/zstd.xibuild (renamed from psibuilds/zstd.psibuild)0
22 files changed, 30 insertions, 30 deletions
diff --git a/psibuilds/psibuild.psibuild b/psibuilds/psibuild.psibuild
deleted file mode 100644
index 2f68018..0000000
--- a/psibuilds/psibuild.psibuild
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DEPS=(bash tar)
-
-SOURCE=https://git.davidovski.xyz/psibuild.git
-
-package () {
- cp psibuild $PKG_DEST/usr/bin/
-}
-
diff --git a/psibuild b/xibuild
index 3b26fed..47ac90b 100755
--- a/psibuild
+++ b/xibuild
@@ -1,6 +1,6 @@
#!/bin/bash
-PSI_ROOT=$(pwd)
+XI_ROOT=$(pwd)
ERROR="\033[0;31m"
INFO="\033[0;34m"
@@ -13,14 +13,14 @@ alias make="make $MAKEFLAGS"
usage () {
cat << EOF
-usage: $0 PSIBUILD
+usage: $0 XIBUILD
EOF
}
-psibuild () {
+xibuild () {
BUILD_FILE=${@: -1}
- cd $PSI_ROOT
+ cd $XI_ROOT
[[ $# = 0 ]] && usage && exit 1
[ ! -f "$BUILD_FILE" ] && echo "$BUILD_FILE not found" && exit 1
@@ -28,7 +28,7 @@ psibuild () {
clean () {
# clean up
rm -rf $PKG_BUILD_DIR
- rmdir $PSI_ROOT/tmp > /dev/null 2>&1
+ rmdir $XI_ROOT/tmp > /dev/null 2>&1
}
build () {
@@ -40,14 +40,14 @@ psibuild () {
source $BUILD_FILE
- PKG_NAME=$(basename $BUILD_FILE .psibuild)
+ PKG_NAME=$(basename $BUILD_FILE .xibuild)
- LOGFILE=$PSI_ROOT/logs/$PKG_NAME.log
- PKGS_OUTPUT=$PSI_ROOT/ppkgs
- PKG_FILE=$PKGS_OUTPUT/$PKG_NAME.ppkg
+ LOGFILE=$XI_ROOT/logs/$PKG_NAME.log
+ PKGS_OUTPUT=$XI_ROOT/xipkgs
+ PKG_FILE=$PKGS_OUTPUT/$PKG_NAME.xipkg
- PKG_BUILD_DIR=$PSI_ROOT/tmp/$PKG_NAME
- PKG_DEST=$PKG_PSI_ROOT/tmp/$PKG_NAME.package
+ PKG_BUILD_DIR=$XI_ROOT/tmp/$PKG_NAME
+ PKG_DEST=$PKG_XI_ROOT/tmp/$PKG_NAME.package
# make sure build dir is clean before starting
rm -rf $PKG_BUILD_DIR
@@ -56,11 +56,11 @@ psibuild () {
mkdir -p $PKG_BUILD_DIR
mkdir -p $PKG_DEST
mkdir -p $PKGS_OUTPUT
- mkdir -p $PSI_ROOT/logs
+ mkdir -p $XI_ROOT/logs
date > $LOGFILE
echo "Build log for $PKG_NAME from $BUILD_FILE\n" >> $LOGFILE
- printf "\033[0;36m====> $PKG_NAME.ppkg\n" | tee -a $LOGFILE
+ printf "\033[0;36m====> $PKG_NAME.xipkg\n" | tee -a $LOGFILE
cd $PKG_BUILD_DIR
@@ -97,19 +97,19 @@ psibuild () {
# go back to root, make things easier
- cd $PSI_ROOT
+ cd $XI_ROOT
printf "$INFO\tarchiving package...";
tar -C $PKG_DEST -czf $PKG_FILE ./ >> $LOGFILE 2>&1 && printf "$PASS archived to $(du -sh $PKG_FILE | awk '{ print $1 }')\n" || printf "$ERROR error! See log\n"
# create info file
- printf "$INFO\tcreating ppkg.info...";
- PKG_INFO=$PKGS_OUTPUT/$PKG_NAME.ppkg.info
+ printf "$INFO\tcreating xipkg.info...";
+ PKG_INFO=$PKGS_OUTPUT/$PKG_NAME.xipkg.info
echo "" > $PKG_INFO
echo "NAME=$PKG_NAME" >> $PKG_INFO
- echo "PKG_FILE=$PKG_NAME.ppkg" >> $PKG_INFO
+ echo "PKG_FILE=$PKG_NAME.xipkg" >> $PKG_INFO
echo "CHECKSUM=$(md5sum $PKG_FILE | awk '{ print $1 }')" >> $PKG_INFO
echo "VER_HASH=$VER_HASH" >> $PKG_INFO
echo "SOURCE=$SOURCE" >> $PKG_INFO
@@ -118,8 +118,8 @@ psibuild () {
printf "$INFOsigning...";
# sign the package
- PRIV_KEY=$PSI_ROOT/keychain/psi.pem
- PUB_KEY=$PSI_ROOT/keychain/psi.pub
+ PRIV_KEY=$XI_ROOT/keychain/xi.pem
+ PUB_KEY=$XI_ROOT/keychain/xi.pub
if [ -f "$PRIV_KEY" ]; then
echo "SIGNATURE=" >> $PKG_INFO
@@ -140,5 +140,5 @@ psibuild () {
FILES=$@
for BUILD_FILE in $FILES; do
- psibuild $BUILD_FILE
+ xibuild $BUILD_FILE
done
diff --git a/psibuilds/bash.psibuild b/xibuilds/bash.xibuild
index b2a0156..b2a0156 100644
--- a/psibuilds/bash.psibuild
+++ b/xibuilds/bash.xibuild
diff --git a/psibuilds/bc.psibuild b/xibuilds/bc.xibuild
index 989dc96..989dc96 100644
--- a/psibuilds/bc.psibuild
+++ b/xibuilds/bc.xibuild
diff --git a/psibuilds/binutils.psibuild b/xibuilds/binutils.xibuild
index ea8caac..ea8caac 100644
--- a/psibuilds/binutils.psibuild
+++ b/xibuilds/binutils.xibuild
diff --git a/psibuilds/bzip2.psibuild b/xibuilds/bzip2.xibuild
index 726f0f7..726f0f7 100644
--- a/psibuilds/bzip2.psibuild
+++ b/xibuilds/bzip2.xibuild
diff --git a/psibuilds/dejagnu.psibuild b/xibuilds/dejagnu.xibuild
index ee09ef3..ee09ef3 100644
--- a/psibuilds/dejagnu.psibuild
+++ b/xibuilds/dejagnu.xibuild
diff --git a/psibuilds/expect.psibuild b/xibuilds/expect.xibuild
index e2288a3..e2288a3 100644
--- a/psibuilds/expect.psibuild
+++ b/xibuilds/expect.xibuild
diff --git a/psibuilds/file.psibuild b/xibuilds/file.xibuild
index 9141847..9141847 100644
--- a/psibuilds/file.psibuild
+++ b/xibuilds/file.xibuild
diff --git a/psibuilds/flex.psibuild b/xibuilds/flex.xibuild
index 88d61a6..88d61a6 100644
--- a/psibuilds/flex.psibuild
+++ b/xibuilds/flex.xibuild
diff --git a/psibuilds/gcc.psibuild b/xibuilds/gcc.xibuild
index 3edb513..3edb513 100644
--- a/psibuilds/gcc.psibuild
+++ b/xibuilds/gcc.xibuild
diff --git a/psibuilds/glibc.psibuild b/xibuilds/glibc.xibuild
index 5b111bd..5b111bd 100644
--- a/psibuilds/glibc.psibuild
+++ b/xibuilds/glibc.xibuild
diff --git a/psibuilds/gmp.psibuild b/xibuilds/gmp.xibuild
index 4a62d77..4a62d77 100644
--- a/psibuilds/gmp.psibuild
+++ b/xibuilds/gmp.xibuild
diff --git a/psibuilds/iana-etc.psibuild b/xibuilds/iana-etc.xibuild
index 6466472..6466472 100644
--- a/psibuilds/iana-etc.psibuild
+++ b/xibuilds/iana-etc.xibuild
diff --git a/psibuilds/m4.psibuild b/xibuilds/m4.xibuild
index f28ec33..f28ec33 100644
--- a/psibuilds/m4.psibuild
+++ b/xibuilds/m4.xibuild
diff --git a/psibuilds/readline.psibuild b/xibuilds/readline.xibuild
index 2721677..2721677 100644
--- a/psibuilds/readline.psibuild
+++ b/xibuilds/readline.xibuild
diff --git a/psibuilds/tar.psibuild b/xibuilds/tar.xibuild
index 829d6d2..829d6d2 100644
--- a/psibuilds/tar.psibuild
+++ b/xibuilds/tar.xibuild
diff --git a/psibuilds/tcl.psibuild b/xibuilds/tcl.xibuild
index 16442f4..16442f4 100644
--- a/psibuilds/tcl.psibuild
+++ b/xibuilds/tcl.xibuild
diff --git a/xibuilds/xibuild.xibuild b/xibuilds/xibuild.xibuild
new file mode 100644
index 0000000..cf88540
--- /dev/null
+++ b/xibuilds/xibuild.xibuild
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DEPS=(bash tar)
+
+SOURCE=https://git.davidovski.xyz/xibuild.git
+
+package () {
+ cp xibuild $PKG_DEST/usr/bin/
+}
+
diff --git a/psibuilds/xz.psibuild b/xibuilds/xz.xibuild
index e17f53b..e17f53b 100644
--- a/psibuilds/xz.psibuild
+++ b/xibuilds/xz.xibuild
diff --git a/psibuilds/zlib.psibuild b/xibuilds/zlib.xibuild
index c771727..c771727 100644
--- a/psibuilds/zlib.psibuild
+++ b/xibuilds/zlib.xibuild
diff --git a/psibuilds/zstd.psibuild b/xibuilds/zstd.xibuild
index 63ba9af..63ba9af 100644
--- a/psibuilds/zstd.psibuild
+++ b/xibuilds/zstd.xibuild