actual 0.1.2 release

Author: BhJaipal

.github/workflows/release.yml

@@ -30,6 +30,7 @@ jobs:
               run: |
                   cd ${{ github.workspace }}
                   ./release.sh ${{ env.tag }}
+                  tree
 
             - name: Create Release
               id: create_release
@@ -50,6 +51,6 @@ jobs:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:
                   upload_url: ${{ steps.create_release.outputs.upload_url }}
-                  asset_path: ./libaloo-v${{ env.tag }}.deb
-                  asset_name: libaloo-v${{ env.tag }}.deb
+                  asset_path: ./libaloo-v${{ env.tag }}-$(arch).deb
+                  asset_name: libaloo-v${{ env.tag }}-$(arch).deb
                   asset_content_type: application/vnd.debian.binary-package

aloo-edit/app/main.c

@@ -1,5 +1,6 @@
-#include "aloo.h"
-#include "common/app.h"
+#include <aloo/aloo.h>
+#include <gtk/gtk.h>
+#include <string.h>
 
 AlooWidget *labelGrid;
 AlooWidget *navbar;

install.sh

@@ -1,17 +1,26 @@
 #!/bin/bash
-./build.sh
-if [ ! $(./build.sh test) ]; then
-	echo -e "Tests failed"
-	exit 1
+if [ -d build ]; then
+	rm -rf build
+	rm -rf bin
+	rm -rf lib
 fi
+./build.sh
 if [ ! $1 ]; then
 	echo -e "Version not specified as argument"
 	exit 1
 fi
+if [ -d "output" ]; then
+	rm -rf output
+fi
+
 mkdir -p output/usr/{include,bin}
 cp -r lib output/usr/lib
-cp -r scripts/src output/etc
-mv output/etc/__init__.py output/usr/bin/aloo.py
+mkdir -p output/etc
+cp -r scripts/src output/etc/aloo
+mv output/etc/aloo/__init__.py output/usr/bin/aloo
+mv output/etc/aloo/aloocli.py output/usr/bin/aloocli
+chmod +x output/usr/bin/*
+
 cp -r include output/usr/include/aloo
 echo "PKG_CONFIG_PATH=/usr/share/pkgconfig/aloo.pc" >output/etc/aloo.conf
 mkdir -p output/usr/share/pkgconfig
@@ -33,8 +42,8 @@ Architecture: all
 Maintainer: Jaipal <[email protected]>
 Description: This a library based on Gtk4 written in C to make things easier
 Depends: libgtk-4-dev, libsqlite3-dev, python3, python3-pip" >DEBIAN/control
-	sudo dpkg-deb --root-owner-group --build . libaloo-v$1.deb
-	mv libaloo-v$1.deb ..
+	sudo dpkg-deb --root-owner-group --build . libaloo-v$1-$(arch).deb
+	mv libaloo-v$1-$(arch).deb ..
 	cd ..
 
 elif [ $(which rpm) && $(which dnf) ]; then
@@ -62,7 +71,7 @@ else
 pkgver=$1
 pkgrel=1
 pkgdesc="This a Gtk4 based library written in C to make things easier"
-arch=("x86_64")
+arch=("$(arch)")
 url="https://github.com/BhJaipal/libaloo"
 license=('MIT')
 depends=(gtk4 sqlite python python-pip)

release.sh

@@ -1,29 +1,35 @@
 #!/bin/bash
-
-if [ ! -d "build/" ]; then
-	mkdir build
+if [ -d build ]; then
+	rm -rf build
+	rm -rf bin
+	rm -rf lib
+fi
+./build.sh
+if [ ! $1 ]; then
+	echo -e "Version not specified as argument"
+	exit 1
 fi
+if [ -d "output" ]; then
+	rm -rf output
+fi
+
 cmake -B build -DCMAKE_BUILD_TYPE=Release
 cd build
 make
 cd ..
-mv scripts/src/__init__.py bin/aloo.py
 
-mkdir -p etc/aloo
-echo "PKG_CONFIG_PATH=/usr/share/pkgconfig/aloo.pc\n" >etc/aloo/aloo.conf
-mv scripts/src/main.c etc/aloo/main.c
-mv scripts/src/test.c etc/aloo/test.c
-mv scripts/src/main.server.c etc/aloo/main.server.c
-mv scripts/src/main.server.h etc/aloo/main.server.h
-mv scripts/src/CMakeLists.txt etc/aloo/CMakeLists.txt
+mkdir -p usr/{include,bin}
+mkdir -p etc
+echo "PKG_CONFIG_PATH=/usr/share/pkgconfig/aloo.pc\n" >etc/aloo.conf
 
-mkdir -p usr/share/pkgconfig
-mkdir usr/include
-mv include usr/include/aloo
 mv lib usr/lib
-mv bin usr/bin
-rm -r bin/test-1.exe
+mv scripts/src etc/aloo
+mv include usr/include/aloo
+mv etc/aloo/__init__.py usr/bin/aloo
+mv etc/aloo/aloocli.py usr/bin/aloocli
+chmod +x usr/bin/*
 
+mkdir -p usr/share/pkgconfig
 echo "Name: aloo
 Version: $1
 Description: This a Gtk4 based library written in C to make things easier
@@ -43,7 +49,7 @@ Architecture: all
 Maintainer: Jaipal <[email protected]>
 Description: This a library based on Gtk4 written in C to make things easier
 Depends: libgtk-4-dev, libsqlite3-dev, python3, python3-pip" >DEBIAN/control
-	sudo dpkg-deb --root-owner-group --build . libaloo-v$1.deb
+	sudo dpkg-deb --root-owner-group --build . libaloo-v$1-$(arch).deb
 elif [ $(which rpm) && $(which dnf) ]; then
 	mkdir SPECS
 	echo "Name: aloo
@@ -65,7 +71,7 @@ else
 pkgver=$1
 pkgrel=1
 pkgdesc="This a Gtk4 based library written in C to make things easier"
-arch=("x86_64")
+arch=("$(arch)")
 url="https://github.com/BhJaipal/libaloo"
 license=('MIT')
 depends=(gtk4 sqlite python python-pip)

scripts/src/__init__.py

@@ -635,7 +635,7 @@ def createApp() -> None:
                         currFilePath = "/".join(__file__.split("/")[:-1])
                         if currFilePath.endswith("bin"):
                             currFilePath = (
-                                "/".join(__file__.split("/")[:-2]) + "/etc/aloo/"
+                                "/".join(__file__.split("/")[:-3]) + "/etc/aloo/"
                             )
                         projectName = ""
                         if appOptions.selectedAppOption != "Path":
@@ -709,15 +709,27 @@ def createApp() -> None:
                             "r",
                         ).read()
 
-                        while colorsCSS.index("\t") != -1:
-                            colorsCSS = colorsCSS.replace("\t", "")
-                        while colorsCSS.index("\n") != -1:
-                            colorsCSS = colorsCSS.replace("\n", "")
+                        try:
+                            while colorsCSS.index("\t") != -1:
+                                colorsCSS = colorsCSS.replace("\t", "")
+                        except:
+                            pass
+                        try:
+                            while colorsCSS.index("\n") != -1:
+                                colorsCSS = colorsCSS.replace("\n", "")
+                        except:
+                            pass
 
-                        while materialCSS.index("\t") != -1:
-                            materialCSS = materialCSS.replace("\t", "")
-                        while materialCSS.index("\n") != -1:
-                            materialCSS = materialCSS.replace("\n", "")
+                        try:
+                            while materialCSS.index("\t") != -1:
+                                materialCSS = materialCSS.replace("\t", "")
+                        except:
+                            pass
+                        try:
+                            while materialCSS.index("\n") != -1:
+                                materialCSS = materialCSS.replace("\n", "")
+                        except:
+                            pass
                         os.mkdir(appInfo["project-name"] + "styles")
                         cssBundle = open(
                             appInfo["project-name"] + "styles/material.bundle.min.css",

scripts/src/aloocli.py

@@ -40,7 +40,7 @@ def createApp(projectOption: str) -> None:
 
     currFilePath = "/".join(__file__.split("/")[:-1])
     if currFilePath.endswith("bin"):
-        currFilePath = "/".join(__file__.split("/")[:-2]) + "/etc/aloo/"
+        currFilePath = "/".join(__file__.split("/")[:-3]) + "/etc/aloo/"
 
     if "aloo.config.yaml" in os.listdir(os.getcwd()):
         os.system("clear")

scripts/src/main.c

@@ -1,5 +1,4 @@
-#include "aloo.h"
-#include "common/app.h"
+#include <aloo/aloo.h>
 AlooApplication *app;
 
 static void activate() {

scripts/src/test.c

@@ -1,4 +1,4 @@
-#include "aloo.h"
+#include <aloo/aloo.h>
 #include <stdio.h>
 AlooApplication *app;
 Test *t;

uninstall.sh

@@ -2,4 +2,3 @@
 sudo rm -rf /etc/aloo
 sudo apt remove aloo -y
 sudo apt autoremove -y
-rm -f dist/deb.deb