Update install script

thangnd85 · Sep 20, 2021 · 6a836f2 · 6a836f2
1 parent f3af1cd
commit 6a836f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -37,7 +37,7 @@ jobs:
       run: |
         sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq update
-        sudo -E apt-get -qq install $(curl -fsSL git.io/ubuntu-2004-openwrt)
+        sudo -E apt-get -qq install $(curl -fsSL git.io/ubuntu-2004-server)
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo timedatectl set-timezone "$TZ"
@@ -52,7 +52,7 @@ jobs:
         [ -s DOWNLOAD_ARMBIAN ] && wget -q -P build/output/images https://github.com/${GITHUB_REPOSITORY}/releases/download/$(cat DOWNLOAD_ARMBIAN)
         cd ./build/output/images && gzip -df *.img.gz && sync && cd ../../../
         sudo chmod +x make kernel.sh
-        sudo ./make s905x3_s905d_s922x
+        sudo ./make s905x2_s905x_s905w_s912
         sudo ./kernel.sh
         cd ./build/output/images && sudo gzip *.img
         echo "FILEPATH=$PWD" >> $GITHUB_ENV

diff --git a/make b/make
@@ -55,7 +55,7 @@ make_image() {
 
         SKIP_MB=68
         BOOT_MB=256
-        ROOT_MB=2550
+        ROOT_MB=2304
         IMG_SIZE=$((SKIP_MB + BOOT_MB + ROOT_MB))
 
         dd if=/dev/zero of=${build_image_file} bs=1M count=${IMG_SIZE} >/dev/null 2>&1
@@ -271,11 +271,12 @@ clean_tmp() {
         sync
         sleep 3
 
-        cd ${tmp_outpath}
-            gzip *.img && sync && mv -f *.img.gz ${armbian_outputpath} && sync
+    cd ${tmp_outpath}
+        gzip *.img && sync && mv -f *.img.gz ${armbian_outputpath} && sync
+
+    cd ${make_path}
+        rm -rf ${tmp_outpath} ${tmp_armbian} ${tmp_build} ${tag_bootfs} ${tag_rootfs} ${tmp_aml_image} 2>/dev/null && sync
 
-        cd ${make_path}
-            rm -rf ${tmp_outpath} ${tmp_armbian} ${tmp_build} ${tag_bootfs} ${tag_rootfs} ${tmp_aml_image} 2>/dev/null && sync
 }
 
 [ $(id -u) = 0 ] || die "please run this script as root: [ sudo ./make ]"