added makefile

5 files changed, 11 insertions, 37 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7165eff
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+PREFIX=/usr
+
+install:
+	install -Dm755 xib.sh ${DESTDIR}${PREFIX}/bin/xib
+	install -Dm755 xibd.sh ${DESTDIR}${PREFIX}/bin/xibd
+
diff --git a/sync.sh b/sync.sh
deleted file mode 100755
index a7a5ae8..0000000
--- a/sync.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-source xib_env
-
-sync () {
-    for i in $@; do
-        echo "syncing from $XIB_EXPORT to $i"
-        [[ $# = 0 ]] || rsync -Lta --no-perms --no-owner --no-group --delete -z -e ssh "$XIB_EXPORT/" $i
-    done;
-}
-
-sync oracle2:/srv/www/xi/html/ cheetah:/srv/www/xi/html/
-
diff --git a/xib.sh b/xib.sh
index c7bae56..71b55d0 100755
--- a/xib.sh
+++ b/xib.sh
@@ -214,7 +214,9 @@ xibd () {
 [ "$#" = 0 ] && {
     xib_all
 } || {
-    for x in $@; do
+    [ "$1" = "-d" ] &&  
+        xibd
+    || for x in $@; do
         xib_single $x
     done
 }
diff --git a/xib_env b/xib_env
deleted file mode 100755
index 2b6418b..0000000
--- a/xib_env
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. /usr/lib/glyphs.sh
-export INFOCHAR=" ~ "
-
-export MAKEFLAGS="-j$(grep "processor" /proc/cpuinfo | wc -l)"
-
-export XIB_DIR="/var/lib/xib"
-export XIB_BUILDFILES="$XIB_DIR/buildfiles"
-export XIB_CHROOT="$XIB_DIR/chroot"
-export XIB_EXPORT="$XIB_DIR/export"
-export LOG_FILE="$XIB_DIR/xib.log"
-
-export PRIV_KEY="/home/david/.ssh/xi.pem"
-export PUB_KEY="/home/david/.ssh/xi.pub"
-export DEVELOPMENT_BUILDFILES="/home/david/docs/proj/xilinux/buildfiles"
-XIB_BUILDFILES=$DEVELOPMENT_BUILDFILES
-
-export BUILDFILES_GIT_REPO="https://xi.davidovski.xyz/git/buildfiles.git"
-export INSTALLED_PACKAGES="$XIB_CHROOT/installed"
-
-export BUILD_PROFILE=$XIB_DIR/build_profile
diff --git a/xibd.sh b/xibd.sh
index 4d41fca..8192b5d 100644
--- a/xibd.sh
+++ b/xibd.sh
@@ -1,2 +1,3 @@
-. ./xib.sh && xibd
+#!/bin/sh
+xib -d