chore: use new directories (#20)

README.md

@@ -1,4 +1,4 @@
-# hardened-chromium-subresource-filter
+# trivalent-subresource-filter
 [![hardened-chromium-subresource-filter](https://img.shields.io/badge/dynamic/json?color=blue&label=hardened-chromium-subresource-filter&query=builds.latest.source_package.version&url=https%3A%2F%2Fcopr.fedorainfracloud.org%2Fapi_3%2Fpackage%3Fownername%3Dsecureblue%26projectname%3Dhardened-chromium%26packagename%3Dhardened-chromium-subresource-filter%26with_latest_build%3DTrue)](https://copr.fedorainfracloud.org/coprs/secureblue/hardened-chromium/package/hardened-chromium-subresource-filter/)
 
 ## Adlist guidelines

copr_script.sh

@@ -34,12 +34,11 @@ readonly LIST_SOURCES=(
     "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt"
     "https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_7_Japanese/filter.txt"
 )
-readonly NAME="hardened-chromium-subresource-filter"
+readonly NAME="trivalent-subresource-filter"
 
 # Clone the repo with the spec file and chrowmium source downloader
 cp $NAME/$NAME.spec ./
 cp $NAME/install_filter.sh ./
-cp $NAME/chromium-latest.py ./
 cp /usr/src/chromium/chromium-*-clean.tar.xz ./
 rm -rf ./$NAME
 

install_filter.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
 
 # Some variables
-readonly INSTALL_DIR="/etc/chromium/filter"
+readonly INSTALL_DIR="/etc/trivalent/filter"
 readonly OLD_DIR="$HOME/.config/chromium"
-readonly FILTER_VER="$(cat $INSTALL_DIR/hardened-chromium-blocklist-version.txt)"
+readonly FILTER_VER="$(cat $INSTALL_DIR/trivalent-blocklist-version.txt)"
 readonly CURRENT_VER="$(ls $OLD_DIR/Subresource\ Filter/Unindexed\ Rules)"
 
 echo "Checking version" # Debug statement
@@ -21,7 +21,7 @@ rm -r "$OLD_DIR/Subresource Filter"
 echo "Creating '$NEW_DIR'" # Debug statement
 mkdir -p "$NEW_DIR"
 echo "Adding filter list from '$INSTALL_DIR'" # Debug statement
-cp "$INSTALL_DIR/hardened-chromium-blocklist" "$NEW_DIR/Filtering Rules"
+cp "$INSTALL_DIR/trivalent-blocklist" "$NEW_DIR/Filtering Rules"
 echo "Creating 'manifest.json'"
 cat << EOF > "$NEW_DIR/manifest.json"
 {

hardened-chromium-subresource-filter.spec → trivalent-subresource-filter.spec

@@ -4,14 +4,15 @@
 	ninja -j %{numjobs} -C '%1' '%2'
 %global chromium_pybin %{__python3}
 %global chromebuilddir out/Release
+%global chromium_name trivalent
 
 Source69: chromium-version.txt
 
-Name:      hardened-chromium-subresource-filter
+Name:      %{chromium_name}-subresource-filter
 BuildArch: noarch
-Requires:  hardened-chromium
+Requires:  %{chromium_name}
 License:   GPL-2.0
-Summary:   Subresource filter for hardened-chromium
+Summary:   Subresource filter for %{chromium_name}
 %{lua:
        local f = io.open(macros['_sourcedir']..'/chromium-version.txt', 'r')
        local content = f:read "*all"
@@ -71,7 +72,7 @@ BuildRequires: libva-devel
 BuildRequires: libatomic
 
 %description
-Filter used by hardened-chromium to provide content blocking.
+Filter used by %{chromium_name} to provide content blocking.
 
 %prep
 %setup -q -n chromium-%{version}
@@ -135,23 +136,23 @@ for filter in filter-*.txt; do
 done
 
 # Run the tool to generate the blocklist
-./%{chromebuilddir}/ruleset_converter --input_format=filter-list --output_format=unindexed-ruleset --input_files=${filters::-1} --output_file=hardened-chromium-blocklist > /dev/null
-cp hardened-chromium-blocklist ../
+./%{chromebuilddir}/ruleset_converter --input_format=filter-list --output_format=unindexed-ruleset --input_files=${filters::-1} --output_file=%{chromium_name}-blocklist > /dev/null
+cp %{chromium_name}-blocklist ../
 
 # Cleanup
 rm -r %{chromebuilddir}
 
 %install
-INSTALL_DIR="%{buildroot}%{_sysconfdir}/chromium/filter"
-SCRIPT_DIR="%{buildroot}%{_libdir}/chromium-browser/"
+INSTALL_DIR="%{buildroot}%{_sysconfdir}/%{chromium_name}/filter"
+SCRIPT_DIR="%{buildroot}%{_libdir}/%{chromium_name}/"
 mkdir -p "$INSTALL_DIR"
 mkdir -p "$SCRIPT_DIR"
-install -m 0644 hardened-chromium-blocklist "$INSTALL_DIR/hardened-chromium-blocklist"
+install -m 0644 %{chromium_name}-blocklist "$INSTALL_DIR/%{chromium_name}-blocklist"
 install -m 0755 %{SOURCE1} "$SCRIPT_DIR/install_filter.sh"
-echo "%{release}" > $INSTALL_DIR/hardened-chromium-blocklist-version.txt
-chmod a+r $INSTALL_DIR/hardened-chromium-blocklist-version.txt
+echo "%{release}" > $INSTALL_DIR/%{chromium_name}-blocklist-version.txt
+chmod a+r $INSTALL_DIR/%{chromium_name}-blocklist-version.txt
 
 %files
-%{_sysconfdir}/chromium/filter/hardened-chromium-blocklist
-%{_sysconfdir}/chromium/filter/hardened-chromium-blocklist-version.txt
-%{_libdir}/chromium-browser/install_filter.sh
+%{_sysconfdir}/%{chromium_name}/filter/%{chromium_name}-blocklist
+%{_sysconfdir}/%{chromium_name}/filter/%{chromium_name}-blocklist-version.txt
+%{_libdir}/%{chromium_name}/install_filter.sh