Beta 2

17 files changed, 29 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2052485..8684e66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,45 @@
 # Maintainer: SkywalkerSW5 <skywalkersw5@protonmail.com>
 pkgname=sarc
-pkgver=b1
+pkgver=b2
 pkgrel=1
 pkgdesc="My suckless setup"
 arch=('any')
 url="https://github.com/SkywalkerSW5/sarc"
 license=('MIT')
-depends=('base-devel' 'adobe-source-code-pro-fonts' 'libnotify' 'dunst' 'picom' 'light' 'feh' 'xorg' 'sx' 'pulseaudio')
+depends=('adobe-source-code-pro-fonts' 'libnotify' 'dunst' 'picom' 'light' 'feh' 'xorg-server' 'sx' 'pulseaudio')
 provides=('dwm' 'st' 'dmenu')
-source=("$pkgname-$pkgver.tar.gz")
-noextract=("$pkgname-tools-$pkgver.tar.xz")
-md5sums=()
+#source=("https://github.com/SkywalkerSW5/sarc/raw/master/tools/$pkgname-$pkgver.tar.xz")
+source=("./$pkgname-$pkgver.tar.xz")
+md5sums=("0e61840463a8058064524750306bae1d")
 
 build() {
 	
-	tar xvf $pkgname-tools-$pkgver.tar.xz
+	cd dwm-6.2
+	make
+	cd ../st
+	make
+	cd ../dmenu-5.0
+	make
+	cd ../dwmblocks
+	make
 }
 
 package() {
-	
-	mv * $pkgdir
-	mkdir -p /usr/local/bin
-	mv bin/* /usr/local/bin/
-	rm -r bin
 
+	cd dwm-6.2
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+	cd ../st
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+	cd ../dmenu-5.0
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+	cd ../dwmblocks
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+	cd ../bin
+	mkdir -p "$pkgdir/usr/local/bin"
+	cp * "$pkgdir/usr/local/bin"
+	cd ..
+	mkdir -p "$pkgdir/usr/src/sarc"
+	cp -r $srcdir/* "$pkgdir/usr/src/sarc/"
+	ls $pkgdir
 }
+
diff --git a/dmenu-5.0/dmenu b/dmenu-5.0/dmenu
deleted file mode 100755
index 60deb5d..0000000
--- a/dmenu-5.0/dmenu
+++ /dev/null
diff --git a/dmenu-5.0/dmenu.o b/dmenu-5.0/dmenu.o
deleted file mode 100644
index fb225c1..0000000
--- a/dmenu-5.0/dmenu.o
+++ /dev/null
diff --git a/dmenu-5.0/drw.o b/dmenu-5.0/drw.o
deleted file mode 100644
index 57700fd..0000000
--- a/dmenu-5.0/drw.o
+++ /dev/null
diff --git a/dmenu-5.0/stest b/dmenu-5.0/stest
deleted file mode 100755
index 4225857..0000000
--- a/dmenu-5.0/stest
+++ /dev/null
diff --git a/dmenu-5.0/stest.o b/dmenu-5.0/stest.o
deleted file mode 100644
index 4ffa357..0000000
--- a/dmenu-5.0/stest.o
+++ /dev/null
diff --git a/dmenu-5.0/util.o b/dmenu-5.0/util.o
deleted file mode 100644
index 3b48c2f..0000000
--- a/dmenu-5.0/util.o
+++ /dev/null
diff --git a/dwm-6.2/drw.o b/dwm-6.2/drw.o
deleted file mode 100644
index ecc65b6..0000000
--- a/dwm-6.2/drw.o
+++ /dev/null
diff --git a/dwm-6.2/dwm b/dwm-6.2/dwm
deleted file mode 100755
index 7299461..0000000
--- a/dwm-6.2/dwm
+++ /dev/null
diff --git a/dwm-6.2/dwm.o b/dwm-6.2/dwm.o
deleted file mode 100644
index c72ab85..0000000
--- a/dwm-6.2/dwm.o
+++ /dev/null
diff --git a/dwm-6.2/util.o b/dwm-6.2/util.o
deleted file mode 100644
index 3b48c2f..0000000
--- a/dwm-6.2/util.o
+++ /dev/null
diff --git a/st/boxdraw.o b/st/boxdraw.o
deleted file mode 100644
index 3080fdc..0000000
--- a/st/boxdraw.o
+++ /dev/null
diff --git a/st/hb.o b/st/hb.o
deleted file mode 100644
index 346d766..0000000
--- a/st/hb.o
+++ /dev/null
diff --git a/st/st b/st/st
deleted file mode 100755
index 90f14ec..0000000
--- a/st/st
+++ /dev/null
diff --git a/st/st.o b/st/st.o
deleted file mode 100644
index 095c6ed..0000000
--- a/st/st.o
+++ /dev/null
diff --git a/st/x.o b/st/x.o
deleted file mode 100644
index b4ef94f..0000000
--- a/st/x.o
+++ /dev/null
diff --git a/tools/sarc-b2.tar.xz b/tools/sarc-b2.tar.xz
new file mode 100644
index 0000000..77189cd
--- /dev/null
+++ b/tools/sarc-b2.tar.xz