From 4033b20ee8cda449650ca139eacee26de92224ac Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 15 Aug 2021 14:16:55 +0200
Subject: [PATCH] Rename apt requirements directory to apt
Previously ignored by the top level .gitignore, because
lib/ is a reserved directory name for python builds.
---
install | 2 +-
installer/{lib => apt}/requirements-debian-buster.apt | 0
installer/{lib => apt}/requirements-ubuntu-bionic.apt | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename installer/{lib => apt}/requirements-debian-buster.apt (100%)
rename installer/{lib => apt}/requirements-ubuntu-bionic.apt (100%)
diff --git a/install b/install
index cc8f989a5..6c2c1aa47 100755
--- a/install
+++ b/install
@@ -713,7 +713,7 @@ if [ "$ignore_dependencies" = "f" ]; then
if [ -x /usr/bin/apt-get ]; then
verbose "\n * Reading requirements-${dist}-${code}.apt..."
loudCmd "apt-get -q update"
- package_list_file="${SCRIPT_DIR}/installer/lib/requirements-${dist}-${code}.apt"
+ package_list_file="${SCRIPT_DIR}/installer/apt/requirements-${dist}-${code}.apt"
if [ ! -f "$package_list_file" ]; then
echo "ERROR: package file does not exist: $package_list_file" >&2
exit 1
diff --git a/installer/lib/requirements-debian-buster.apt b/installer/apt/requirements-debian-buster.apt
similarity index 100%
rename from installer/lib/requirements-debian-buster.apt
rename to installer/apt/requirements-debian-buster.apt
diff --git a/installer/lib/requirements-ubuntu-bionic.apt b/installer/apt/requirements-ubuntu-bionic.apt
similarity index 100%
rename from installer/lib/requirements-ubuntu-bionic.apt
rename to installer/apt/requirements-ubuntu-bionic.apt