fixup: correctly fail nested cmd & switch to curl

alexVinarskis · Sep 29, 2023 · d740c34 · d740c34
1 parent 9836036
commit d740c34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/classes/dependencies_manager.dart b/lib/classes/dependencies_manager.dart
@@ -33,8 +33,8 @@ class DependenciesManager {
         List<ProcessResult> prs = (await shell.run('''    
           rm -rf ${Constants.packagesLinuxDownloadPath}/*     
           mkdir -p ${Constants.packagesLinuxDownloadPath}
-          wget --user-agent="Mozilla" ${Constants.packagesLinuxUrlLibssl[0]} -O ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlLibssl[1]}
-          wget --user-agent="Mozilla" ${Constants.packagesLinuxUrlDell[0]}   -O ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlDell[1]}
+          curl -L -A "User-Agent Mozilla" ${Constants.packagesLinuxUrlLibssl[0]} -o ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlLibssl[1]}
+          curl -L -A "User-Agent Mozilla" ${Constants.packagesLinuxUrlDell[0]}   -o ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlDell[1]}
           '''));
         for (ProcessResult pr in prs) {
           result = pr.exitCode == 0 && result;
@@ -56,7 +56,7 @@ class DependenciesManager {
         // Install libssl *first*, else after dell command cli is install, it may be queried, and may crash if libssl is missing
         List<ProcessResult> prs = (await shell.run('''
           tar -xf ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlDell[1]} -C ${Constants.packagesLinuxDownloadPath}
-          pkexec sh -c "apt install -y -f ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlLibssl[1]}; apt install -y -f ${Constants.packagesLinuxDownloadPath}/*.deb; rm -rf ${Constants.packagesLinuxDownloadPath}/*"
+          pkexec bash -c "ss=0; apt install -y -f ${Constants.packagesLinuxDownloadPath}/${Constants.packagesLinuxUrlLibssl[1]} || ((ss++)); apt install -y -f ${Constants.packagesLinuxDownloadPath}/*.deb || ((ss++)); rm -rf ${Constants.packagesLinuxDownloadPath}/* || ((ss++)); exit \$ss"
           '''));
         for (ProcessResult pr in prs) {
           result = pr.exitCode == 0 && result;

diff --git a/package.sh b/package.sh
@@ -48,7 +48,7 @@ ARCHITECTURE="amd64"
 PRIORITY="standard"
 MAINTAINER="alexVinarskis <alex.vinarskis@gmail.com>"
 HOMEPAGE="https://github.com/alexVinarskis/dell-powermanager"
-DEPENDS="libgtk-3-0, libblkid1, liblzma5, wget, tar, pkexec, power-profiles-daemon"
+DEPENDS="libgtk-3-0, libblkid1, liblzma5, curl, tar, pkexec, power-profiles-daemon, bash"
 DESCRIPTION="Cross-Platform Dell Power Manager re-implementation in Flutter"
 
 # Create control file of .deb
@@ -73,3 +73,5 @@ echo "sudo rm -f $PATH_EXEC" >> "$DEB_DIR"/prerm
 # Package
 dpkg-deb --build --root-owner-group ./package
 mv ./package.deb ./${PACKAGE}_${VERSION}_${ARCHITECTURE}.deb
+echo "Success! Produced './${PACKAGE}_${VERSION}_${ARCHITECTURE}.deb'"
+rm -rf ./package