From 2753a4c3d7f0f931358e1ed89e91307e73e01559 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Sat, 17 Aug 2024 09:52:10 +0800 Subject: [PATCH] Qualify os family name --- src/chsrc.c | 42 +++++++++---------- .../os/{apt-family => APT}/Kali-Linux.c | 0 .../os/{apt-family => APT}/Linux-Lite.c | 0 .../os/{apt-family => APT}/Linux-Mint.c | 0 src/recipe/os/{apt-family => APT}/armbian.c | 0 src/recipe/os/{apt-family => APT}/common.h | 0 src/recipe/os/{apt-family => APT}/debian.c | 0 src/recipe/os/{apt-family => APT}/deepin.c | 0 src/recipe/os/{apt-family => APT}/openKylin.c | 0 .../os/{apt-family => APT}/raspberrypi.c | 0 src/recipe/os/{apt-family => APT}/ros.c | 0 src/recipe/os/{apt-family => APT}/trisquel.c | 0 src/recipe/os/{apt-family => APT}/ubuntu.c | 0 src/recipe/os/{yum-family => YUM}/AlmaLinux.c | 0 src/recipe/os/{yum-family => YUM}/Anolis-OS.c | 0 .../os/{yum-family => YUM}/Fedora-Linux.c | 0 .../os/{yum-family => YUM}/Rocky-Linux.c | 0 src/recipe/os/{yum-family => YUM}/common.h | 0 src/recipe/os/{yum-family => YUM}/openEuler.c | 0 .../os/{pacman-family => pacman}/Arch-Linux.c | 0 .../os/{pacman-family => pacman}/MSYS2.c | 0 .../{pacman-family => pacman}/Manjaro-Linux.c | 0 22 files changed, 21 insertions(+), 21 deletions(-) rename src/recipe/os/{apt-family => APT}/Kali-Linux.c (100%) rename src/recipe/os/{apt-family => APT}/Linux-Lite.c (100%) rename src/recipe/os/{apt-family => APT}/Linux-Mint.c (100%) rename src/recipe/os/{apt-family => APT}/armbian.c (100%) rename src/recipe/os/{apt-family => APT}/common.h (100%) rename src/recipe/os/{apt-family => APT}/debian.c (100%) rename src/recipe/os/{apt-family => APT}/deepin.c (100%) rename src/recipe/os/{apt-family => APT}/openKylin.c (100%) rename src/recipe/os/{apt-family => APT}/raspberrypi.c (100%) rename src/recipe/os/{apt-family => APT}/ros.c (100%) rename src/recipe/os/{apt-family => APT}/trisquel.c (100%) rename src/recipe/os/{apt-family => APT}/ubuntu.c (100%) rename src/recipe/os/{yum-family => YUM}/AlmaLinux.c (100%) rename src/recipe/os/{yum-family => YUM}/Anolis-OS.c (100%) rename src/recipe/os/{yum-family => YUM}/Fedora-Linux.c (100%) rename src/recipe/os/{yum-family => YUM}/Rocky-Linux.c (100%) rename src/recipe/os/{yum-family => YUM}/common.h (100%) rename src/recipe/os/{yum-family => YUM}/openEuler.c (100%) rename src/recipe/os/{pacman-family => pacman}/Arch-Linux.c (100%) rename src/recipe/os/{pacman-family => pacman}/MSYS2.c (100%) rename src/recipe/os/{pacman-family => pacman}/Manjaro-Linux.c (100%) diff --git a/src/chsrc.c b/src/chsrc.c index a4dc5c6..6fddaf1 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -40,32 +40,32 @@ -#include "recipe/os/apt-family/common.h" -#include "recipe/os/apt-family/debian.c" -#include "recipe/os/apt-family/ubuntu.c" +#include "recipe/os/APT/common.h" +#include "recipe/os/APT/debian.c" +#include "recipe/os/APT/ubuntu.c" // Debian-based -#include "recipe/os/apt-family/armbian.c" -#include "recipe/os/apt-family/raspberrypi.c" -#include "recipe/os/apt-family/Kali-Linux.c" +#include "recipe/os/APT/armbian.c" +#include "recipe/os/APT/raspberrypi.c" +#include "recipe/os/APT/Kali-Linux.c" // Ubuntu-based -#include "recipe/os/apt-family/Linux-Mint.c" -#include "recipe/os/apt-family/trisquel.c" -#include "recipe/os/apt-family/Linux-Lite.c" +#include "recipe/os/APT/Linux-Mint.c" +#include "recipe/os/APT/trisquel.c" +#include "recipe/os/APT/Linux-Lite.c" // Independent -#include "recipe/os/apt-family/ros.c" -#include "recipe/os/apt-family/openKylin.c" -#include "recipe/os/apt-family/deepin.c" +#include "recipe/os/APT/ros.c" +#include "recipe/os/APT/openKylin.c" +#include "recipe/os/APT/deepin.c" -#include "recipe/os/yum-family/common.h" -#include "recipe/os/yum-family/Fedora-Linux.c" -#include "recipe/os/yum-family/AlmaLinux.c" -#include "recipe/os/yum-family/Rocky-Linux.c" -#include "recipe/os/yum-family/openEuler.c" -#include "recipe/os/yum-family/Anolis-OS.c" +#include "recipe/os/YUM/common.h" +#include "recipe/os/YUM/Fedora-Linux.c" +#include "recipe/os/YUM/AlmaLinux.c" +#include "recipe/os/YUM/Rocky-Linux.c" +#include "recipe/os/YUM/openEuler.c" +#include "recipe/os/YUM/Anolis-OS.c" -#include "recipe/os/pacman-family/Arch-Linux.c" -#include "recipe/os/pacman-family/Manjaro-Linux.c" -#include "recipe/os/pacman-family/MSYS2.c" +#include "recipe/os/pacman/Arch-Linux.c" +#include "recipe/os/pacman/Manjaro-Linux.c" +#include "recipe/os/pacman/MSYS2.c" #include "recipe/os/opensuse.c" #include "recipe/os/gentoo.c" diff --git a/src/recipe/os/apt-family/Kali-Linux.c b/src/recipe/os/APT/Kali-Linux.c similarity index 100% rename from src/recipe/os/apt-family/Kali-Linux.c rename to src/recipe/os/APT/Kali-Linux.c diff --git a/src/recipe/os/apt-family/Linux-Lite.c b/src/recipe/os/APT/Linux-Lite.c similarity index 100% rename from src/recipe/os/apt-family/Linux-Lite.c rename to src/recipe/os/APT/Linux-Lite.c diff --git a/src/recipe/os/apt-family/Linux-Mint.c b/src/recipe/os/APT/Linux-Mint.c similarity index 100% rename from src/recipe/os/apt-family/Linux-Mint.c rename to src/recipe/os/APT/Linux-Mint.c diff --git a/src/recipe/os/apt-family/armbian.c b/src/recipe/os/APT/armbian.c similarity index 100% rename from src/recipe/os/apt-family/armbian.c rename to src/recipe/os/APT/armbian.c diff --git a/src/recipe/os/apt-family/common.h b/src/recipe/os/APT/common.h similarity index 100% rename from src/recipe/os/apt-family/common.h rename to src/recipe/os/APT/common.h diff --git a/src/recipe/os/apt-family/debian.c b/src/recipe/os/APT/debian.c similarity index 100% rename from src/recipe/os/apt-family/debian.c rename to src/recipe/os/APT/debian.c diff --git a/src/recipe/os/apt-family/deepin.c b/src/recipe/os/APT/deepin.c similarity index 100% rename from src/recipe/os/apt-family/deepin.c rename to src/recipe/os/APT/deepin.c diff --git a/src/recipe/os/apt-family/openKylin.c b/src/recipe/os/APT/openKylin.c similarity index 100% rename from src/recipe/os/apt-family/openKylin.c rename to src/recipe/os/APT/openKylin.c diff --git a/src/recipe/os/apt-family/raspberrypi.c b/src/recipe/os/APT/raspberrypi.c similarity index 100% rename from src/recipe/os/apt-family/raspberrypi.c rename to src/recipe/os/APT/raspberrypi.c diff --git a/src/recipe/os/apt-family/ros.c b/src/recipe/os/APT/ros.c similarity index 100% rename from src/recipe/os/apt-family/ros.c rename to src/recipe/os/APT/ros.c diff --git a/src/recipe/os/apt-family/trisquel.c b/src/recipe/os/APT/trisquel.c similarity index 100% rename from src/recipe/os/apt-family/trisquel.c rename to src/recipe/os/APT/trisquel.c diff --git a/src/recipe/os/apt-family/ubuntu.c b/src/recipe/os/APT/ubuntu.c similarity index 100% rename from src/recipe/os/apt-family/ubuntu.c rename to src/recipe/os/APT/ubuntu.c diff --git a/src/recipe/os/yum-family/AlmaLinux.c b/src/recipe/os/YUM/AlmaLinux.c similarity index 100% rename from src/recipe/os/yum-family/AlmaLinux.c rename to src/recipe/os/YUM/AlmaLinux.c diff --git a/src/recipe/os/yum-family/Anolis-OS.c b/src/recipe/os/YUM/Anolis-OS.c similarity index 100% rename from src/recipe/os/yum-family/Anolis-OS.c rename to src/recipe/os/YUM/Anolis-OS.c diff --git a/src/recipe/os/yum-family/Fedora-Linux.c b/src/recipe/os/YUM/Fedora-Linux.c similarity index 100% rename from src/recipe/os/yum-family/Fedora-Linux.c rename to src/recipe/os/YUM/Fedora-Linux.c diff --git a/src/recipe/os/yum-family/Rocky-Linux.c b/src/recipe/os/YUM/Rocky-Linux.c similarity index 100% rename from src/recipe/os/yum-family/Rocky-Linux.c rename to src/recipe/os/YUM/Rocky-Linux.c diff --git a/src/recipe/os/yum-family/common.h b/src/recipe/os/YUM/common.h similarity index 100% rename from src/recipe/os/yum-family/common.h rename to src/recipe/os/YUM/common.h diff --git a/src/recipe/os/yum-family/openEuler.c b/src/recipe/os/YUM/openEuler.c similarity index 100% rename from src/recipe/os/yum-family/openEuler.c rename to src/recipe/os/YUM/openEuler.c diff --git a/src/recipe/os/pacman-family/Arch-Linux.c b/src/recipe/os/pacman/Arch-Linux.c similarity index 100% rename from src/recipe/os/pacman-family/Arch-Linux.c rename to src/recipe/os/pacman/Arch-Linux.c diff --git a/src/recipe/os/pacman-family/MSYS2.c b/src/recipe/os/pacman/MSYS2.c similarity index 100% rename from src/recipe/os/pacman-family/MSYS2.c rename to src/recipe/os/pacman/MSYS2.c diff --git a/src/recipe/os/pacman-family/Manjaro-Linux.c b/src/recipe/os/pacman/Manjaro-Linux.c similarity index 100% rename from src/recipe/os/pacman-family/Manjaro-Linux.c rename to src/recipe/os/pacman/Manjaro-Linux.c