RemoveAllGUI

victor7w7r · Mar 26, 2024 · b279cfa · b279cfa
1 parent 32aef72
commit b279cfa
Show file tree

Hide file tree

Showing 47 changed files with 78 additions and 245 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ permissions:
   contents: write
 jobs:
   maccompile:
-    name: Compile EfiToggler for macOS Intel 64
+    name: Compile EfiToggler for macOS
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -16,36 +16,15 @@ jobs:
           channel: 'stable'
       - name: Compile CLI
         run: |
-          cd efitoggler_cli
+          cd efitoggler
           mkdir dist
           dart pub get
-          dart compile exe bin/efitoggler_cli.dart -o efitoggler_cli
-          mv efitoggler_cli dist
-      - name: Compile and ZIP GUI
-        run: |
-          cd efitoggler_gui
-          flutter pub get
-          flutter config --enable-macos-desktop
-          flutter build macos --release
-          mkdir build/macos/Build/Products/Release/app
-          mv 'build/macos/Build/Products/Release/Efi Toggler.app' build/macos/Build/Products/Release/app
-      - uses: thedoctor0/zip-release@master
-        with:
-          type: 'zip'
-          filename: efitoggler_gui.zip
-          directory: efitoggler_gui/build/macos/Build/Products/Release/app
-      - run: |
-          cd efitoggler_gui
-          mkdir build/macos/Build/Products/Release/app/zip
-          mv build/macos/Build/Products/Release/app/efitoggler_gui.zip build/macos/Build/Products/Release/app/zip
+          dart compile exe bin/efitoggler.dart -o efitoggler
+          mv efitoggler dist
       - uses: actions/upload-artifact@v4
         with:
-          name: bin-efitoggler_cli
-          path: efitoggler_cli/dist
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-efitoggler_gui
-          path: efitoggler_gui/build/macos/Build/Products/Release/app/zip
+          name: bin-efitoggler
+          path: efitoggler/dist
   linuxcompile:
     needs: maccompile
     name: Compile all linux utilites
@@ -55,164 +34,56 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-      - name: Compile CLI
+      - name: Compile Apps
         run: |
-          mkdir rsyncer_cli/dist
-          mkdir ext4_optimizer_cli/dist
-          mkdir usb_manager_cli/dist
-          cd rsyncer_cli
+          mkdir rsyncer/dist
+          mkdir ext4_optimizer/dist
+          mkdir usb_manager/dist
+          cd rsyncer
           dart pub get
-          dart compile exe bin/rsyncer_cli.dart -o rsyncer_cli-amd64
-          mv rsyncer_cli-amd64 dist
-          cd ../ext4_optimizer_cli
+          dart compile exe bin/rsyncer.dart -o rsyncer
+          mv rsyncer dist
+          cd ../ext4_optimizer
           dart pub get
-          dart compile exe bin/ext4_optimizer_cli.dart -o ext4_optimizer_cli-amd64
-          mv ext4_optimizer_cli-amd64 dist
-          cd ../usb_manager_cli
+          dart compile exe bin/ext4_optimizer.dart -o ext4_optimizer
+          mv ext4_optimizer dist
+          cd ../usb_manager
           dart pub get
-          dart compile exe bin/usb_manager_cli.dart -o usb_manager_cli-amd64
-          mv usb_manager_cli-amd64 dist
-      - name: Compile GUI
-        run: |
-          sudo apt update -y
-          sudo apt install -y clang ninja-build libgtk-3-dev
-          flutter doctor
-          flutter config --enable-linux-desktop
-          cd rsyncer_gui
-          flutter pub get
-          flutter build linux --release
-          cd ../ext4_optimizer_gui
-          flutter pub get
-          flutter build linux --release
-          cd ../usb_manager_gui
-          flutter pub get
-          flutter build linux --release
-      - uses: thedoctor0/zip-release@master
-        with:
-          type: 'zip'
-          filename: rsyncer_gui-amd64.zip
-          directory: rsyncer_gui/build/linux/x64/release/bundle
-      - run: |
-          cd rsyncer_gui
-          mkdir build/linux/x64/release/bundle/zip
-          mv build/linux/x64/release/bundle/rsyncer_gui-amd64.zip build/linux/x64/release/bundle/zip
-      - uses: thedoctor0/zip-release@master
-        with:
-          type: 'zip'
-          filename: ext4_optimizer_gui-amd64.zip
-          directory: ext4_optimizer_gui/build/linux/x64/release/bundle
-      - run: |
-          cd ext4_optimizer_gui
-          mkdir build/linux/x64/release/bundle/zip
-          mv build/linux/x64/release/bundle/ext4_optimizer_gui-amd64.zip build/linux/x64/release/bundle/zip
-      - uses: thedoctor0/zip-release@master
-        with:
-          type: 'zip'
-          filename: usb_manager_gui-amd64.zip
-          directory: usb_manager_gui/build/linux/x64/release/bundle
-      - run: |
-          cd usb_manager_gui
-          mkdir build/linux/x64/release/bundle/zip
-          mv build/linux/x64/release/bundle/usb_manager_gui-amd64.zip build/linux/x64/release/bundle/zip
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-rsyncer_cli-amd64
-          path: rsyncer_cli/dist
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-ext4_optimizer_cli-amd64
-          path: ext4_optimizer_cli/dist
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-usb_manager_cli-amd64
-          path: usb_manager_cli/dist
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-rsyncer_gui-amd64
-          path: rsyncer_gui/build/linux/x64/release/bundle/zip
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-ext4_optimizer_gui-amd64
-          path: ext4_optimizer_gui/build/linux/x64/release/bundle/zip
-      - uses: actions/upload-artifact@v4
-        with:
-          name: bin-usb_manager_gui-amd64
-          path: usb_manager_gui/build/linux/x64/release/bundle/zip
-  armlinuxcompile:
-    needs: linuxcompile
-    name: Compile for arm64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
-      - run: |
-          docker run --rm \
-            --platform linux/arm64 \
-            --volume "$PWD:$PWD" \
-            --workdir "$PWD" \
-            docker.io/library/dart:latest \
-            /bin/sh -c "chmod +x arm64build && ./arm64build"
+          dart compile exe bin/usb_manager.dart -o usb_manager
+          mv usb_manager dist
       - uses: actions/upload-artifact@v4
         with:
-          name: bin-rsyncer_cli-arm64
-          path: rsyncer_cli/dist
+          name: bin-rsyncer
+          path: rsyncer/dist
       - uses: actions/upload-artifact@v4
         with:
-          name: bin-ext4_optimizer_cli-arm64
-          path: ext4_optimizer_cli/dist
+          name: bin-ext4_optimizer
+          path: ext4_optimizer/dist
       - uses: actions/upload-artifact@v4
         with:
-          name: bin-usb_manager_cli-arm64
-          path: usb_manager_cli/dist
+          name: bin-usb_manager
+          path: usb_manager/dist
   release:
-    needs: armlinuxcompile
+    needs: linuxcompile
     name: Release to Repository
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: bin-efitoggler_cli
-          path: bin-efcli
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-efitoggler_gui
-          path: bin-efgui
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-rsyncer_cli-amd64
-          path: bin-rsycliamd64
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-ext4_optimizer_cli-amd64
-          path: bin-extcliamd64
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-usb_manager_cli-amd64
-          path: bin-usbcliamd64
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-rsyncer_gui-amd64
-          path: bin-rsyguiamd64
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-ext4_optimizer_gui-amd64
-          path: bin-extguiamd64
-      - uses: actions/download-artifact@v4
-        with:
-          name: bin-usb_manager_gui-amd64
-          path: bin-usbguiamd64
+          name: bin-efitoggler
+          path: bin-ef
       - uses: actions/download-artifact@v4
         with:
-          name: bin-rsyncer_cli-arm64
-          path: bin-rsycliarm64
+          name: bin-rsyncer
+          path: bin-rsy
       - uses: actions/download-artifact@v4
         with:
-          name: bin-ext4_optimizer_cli-arm64
-          path: bin-extcliarm64
+          name: bin-ext4_optimizer
+          path: bin-ext
       - uses: actions/download-artifact@v4
         with:
-          name: bin-usb_manager_cli-arm64
-          path: bin-usbcliarm64
+          name: bin-usb_manager
+          path: bin-usb
       - uses: softprops/action-gh-release@v1
         with:
           draft: true

diff --git a/README.md b/README.md
@@ -19,19 +19,13 @@ Utilites for GNU/Linux and macOS
 - rsyncer: Dialog-based simple application that copy all contents from a source directory to a destination directory, it's recommended to copy root filesystems (Only runs in GNU/Linux).
   - You need the next binaries `rsync`
 
-## Architecture
-
-Flutter apps was made with the 036 Architecture for Flutter
-
-![Alt text](flutterarch.png?raw=true "Title")
-
 ## Debug and Compile
 
 - Install your sdks
 
 ```bash
-$ yay -S flutter  #Archlinux with yay (AUR)
-$ brew install --cask flutter  #macOS
+$ yay -S dart  #Archlinux with yay (AUR)
+$ brew install --cask dart-sdk  #macOS
 ```
 
 - Clone this repository
@@ -40,37 +34,22 @@ $ brew install --cask flutter  #macOS
 - Choose your flavour lang and initialize the packages
 
 ```bash
-# Dart
-$ cd 036utils/efitoggler_cli
+$ cd 036utils/efitoggler
 $ dart pub get
-
-# Flutter
-$ cd 036utils/efitoggler_cli
-$ flutter pub get
 ```
 
 - Run your favourite app
 
 ```bash
-# Dart
-$ cd 036utils/efitoggler_cli/bin
-$ dart efitoggler_cli.dart
-
-# Flutter
-$ cd 036utils/efitoggler_gui
-$ flutter run
+$ cd 036utils/efitoggler/bin
+$ dart efitoggler.dart
 ```
 
 - And compile your app
 
 ```bash
-# Dart
-$ cd 036utils/efitoggler_cli/bin
-$ dart compile exe efitoggler_cli.dart -o efitoggler_cli
-
-# Flutter
-$ cd 036utils/efitoggler_gui
-$ flutter build
+$ cd 036utils/efitoggler/bin
+$ dart compile exe efitoggler.dart -o efitoggler
 ```
 
 ## Development Suite

diff --git a/arm64build b/arm64build
diff --git a/efitoggler_cli/.gitignore → efitoggler/.gitignore b/efitoggler_cli/.gitignore → efitoggler/.gitignore
diff --git a/rsyncer_cli/.vscode/launch.json → efitoggler/.vscode/launch.json b/rsyncer_cli/.vscode/launch.json → efitoggler/.vscode/launch.json
@@ -2,11 +2,11 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "efitoggler_cli",
+      "name": "efitoggler",
       "console": "terminal",
       "request": "launch",
       "type": "dart",
-      "program": "bin/rsyncer_cli.dart",
+      "program": "bin/efitoggler.dart",
     }
   ]
 }
diff --git a/efitoggler_cli/analysis_options.yaml → efitoggler/analysis_options.yaml b/efitoggler_cli/analysis_options.yaml → efitoggler/analysis_options.yaml
diff --git a/efitoggler_cli/bin/efitoggler_cli.dart → efitoggler/bin/efitoggler.dart b/efitoggler_cli/bin/efitoggler_cli.dart → efitoggler/bin/efitoggler.dart
@@ -1,6 +1,6 @@
 import 'package:zerothreesix_dart/zerothreesix_dart.dart';
 
-import 'package:efitoggler_cli/efitoggler_cli.dart';
+import 'package:efitoggler/efitoggler.dart';
 
 void main() async {
   init();

diff --git a/efitoggler_cli/lib/efitoggler_cli.dart → efitoggler/lib/efitoggler.dart b/efitoggler_cli/lib/efitoggler_cli.dart → efitoggler/lib/efitoggler.dart
@@ -1,4 +1,4 @@
-library efitoggler_cli;
+library efitoggler;
 
 export 'init.dart';
 export 'lang.dart';

diff --git a/efitoggler_cli/lib/init.dart → efitoggler/lib/init.dart b/efitoggler_cli/lib/init.dart → efitoggler/lib/init.dart
@@ -2,7 +2,7 @@ import 'dart:io' show Platform;
 
 import 'package:zerothreesix_dart/zerothreesix_dart.dart';
 
-import 'package:efitoggler_cli/lang.dart';
+import 'package:efitoggler/lang.dart';
 
 void init() {
   clear();

diff --git a/efitoggler_cli/lib/lang.dart → efitoggler/lib/lang.dart b/efitoggler_cli/lib/lang.dart → efitoggler/lib/lang.dart
diff --git a/efitoggler_cli/lib/macos_efi.dart → efitoggler/lib/macos_efi.dart b/efitoggler_cli/lib/macos_efi.dart → efitoggler/lib/macos_efi.dart
diff --git a/efitoggler_cli/pubspec.lock → efitoggler/pubspec.lock b/efitoggler_cli/pubspec.lock → efitoggler/pubspec.lock
@@ -106,4 +106,4 @@ packages:
     source: hosted
     version: "0.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.3.2 <4.0.0"
diff --git a/efitoggler_cli/pubspec.yaml → efitoggler/pubspec.yaml b/efitoggler_cli/pubspec.yaml → efitoggler/pubspec.yaml
@@ -1,9 +1,9 @@
-name: efitoggler_cli
-description: efitoggler_cli
+name: efitoggler
+description: efitoggler
 version: 1.0.0
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.3.2 <4.0.0'
 
 dependencies:
   zerothreesix_dart: ^0.1.2

diff --git a/ext4_optimizer_cli/.gitignore → ext4_optimizer/.gitignore b/ext4_optimizer_cli/.gitignore → ext4_optimizer/.gitignore
diff --git a/efitoggler_cli/.vscode/launch.json → ext4_optimizer/.vscode/launch.json b/efitoggler_cli/.vscode/launch.json → ext4_optimizer/.vscode/launch.json
@@ -2,11 +2,11 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "efitoggler_cli",
+      "name": "ext4_optimizer",
       "console": "terminal",
       "request": "launch",
       "type": "dart",
-      "program": "bin/efitoggler_cli.dart",
+      "program": "bin/ext4_optimizer.dart",
     }
   ]
 }
diff --git a/ext4_optimizer_cli/analysis_options.yaml → ext4_optimizer/analysis_options.yaml b/ext4_optimizer_cli/analysis_options.yaml → ext4_optimizer/analysis_options.yaml