OSDN Git Service

[update] : Limited PPA files.
authorhayao <shun819.mail@gmail.com>
Thu, 14 May 2020 14:02:51 +0000 (23:02 +0900)
committerhayao <shun819.mail@gmail.com>
Thu, 14 May 2020 14:02:51 +0000 (23:02 +0900)
channels/serene/ppa_list.amd64 [new file with mode: 0644]
lubs

diff --git a/channels/serene/ppa_list.amd64 b/channels/serene/ppa_list.amd64
new file mode 100644 (file)
index 0000000..9841b59
--- /dev/null
@@ -0,0 +1 @@
+# LUBS PPA List
\ No newline at end of file
diff --git a/lubs b/lubs
index d48a1b5..d9fbafc 100755 (executable)
--- a/lubs
+++ b/lubs
@@ -197,16 +197,19 @@ make_sourcelist() {
 
         run_cmd apt-get update
     fi
-
-    if [[ -n $(find ${channels_dir}/*/ppa -type f) ]]; then; then
-        _apt_install software-properties-common
-
-        for ppa_list in $(find ${channels_dir}/* -type f -name ppa); do
-            for ppa in $(grep -h -v ^'#' ${ppa-list}); do
-                run_cmd add-apt-repository --yes "${ppa}"
-            done
+    
+    # PPA
+    local PPA_FILELIST
+    local _PPA_FILE
+    local _ppa
+
+    PPA_FILELIST=("${channels_dir}/${channel_name}/ppa_list.${arch}"
+    _apt_install software-properties-common
+    for _PPA_FILE in ${PPA_FILELIST[@]}; do
+        for _ppa in $(grep -h -v ^'#' ${_PPA_FILE}); do
+            run_cmd add-apt-repository --yes "${_ppa}"
         done
-    fi
+    done
 }
 
 make_systemd() {