From: mk-linux419 <m.k419sabuaka@gmail.com>
Date: Sat, 5 Sep 2020 12:28:19 +0000 (+0900)
Subject: [update] : Good Bye Snapd
X-Git-Url: http://git.osdn.net/view?p=alterlinux%2FLUBS.git;a=commitdiff_plain;h=27068fb3b1b1606380f41c739259c019c106352b

[update] : Good Bye Snapd
---

diff --git a/channels/serene/snap-packages.amd64 b/channels/serene/snap-packages.amd64
deleted file mode 100644
index e3c3fd2..0000000
--- a/channels/serene/snap-packages.amd64
+++ /dev/null
@@ -1 +0,0 @@
-# LUBS Snap List
diff --git a/channels/share/snap-packages.amd64 b/channels/share/snap-packages.amd64
deleted file mode 100644
index 440d46a..0000000
--- a/channels/share/snap-packages.amd64
+++ /dev/null
@@ -1 +0,0 @@
-# LUBS Snap List
diff --git a/lubs b/lubs
index f6d394e..ab581b1 100755
--- a/lubs
+++ b/lubs
@@ -340,25 +340,6 @@ make_apt_packages() {
     remove "${work_dir}/airootfs/aptpkglist"
 }
 
-make_snap_packages() {
-    remove "${work_dir}/airootfs/snappkglist"
-
-    if [[ -f "${channels_dir}/share/snap-packages.${arch}" ]]; then
-        grep -h -v ^'#' "${channels_dir}/share/snap-packages.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/snappkglist"
-    fi
-
-    if [[ -f "${channels_dir}/${channel_name}/snap-packages.${arch}" ]]; then
-        grep -h -v ^'#' "${channels_dir}/${channel_name}/snap-packages.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/snappkglist"
-    fi
-
-    if [[ -s "${work_dir}/airootfs/snappkglist" ]]; then
-        _apt_install snapd
-        run_cmd env -i bash -c 'snap install $(echo $(<snappkglist))'
-    fi
-
-    remove "${work_dir}/airootfs/snappkglist"
-}
-
 make_config() {
     # Locales
     run_cmd env -i bash -c 'DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8 LC_ALL=C LANGUAGE=en_US.UTF-8 dpkg-reconfigure locales'
@@ -634,7 +615,6 @@ run_once make_basefs
 run_once make_sourcelist
 run_once make_systemd
 run_once make_apt_packages
-#run_once make_snap_packages
 run_once make_config
 run_once make_add_user
 run_once make_clean