diff --git a/sa-train-user.sh b/sa-train-user.sh
index 3c4d7c0..9f6a467 100644
--- a/sa-train-user.sh
+++ b/sa-train-user.sh
@@ -23,7 +23,7 @@ typeset -i "MAX_AGE=${max_age:-90}"
function examine
{
local subdir=$1
- if [[ -n "$subdir" -a "$subdir" == "${subdir%/}" ]]; then
+ if [[ -n "$subdir" && "$subdir" == "${subdir%/}" ]]; then
subdir="$subdir/"
fi
if [[ ! -d ./${subdir}cur ]]; then
diff --git a/sa-train.ipr b/sa-train.ipr
deleted file mode 100644
index 0d09a77..0000000
--- a/sa-train.ipr
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CodeNarc - Ruleset rulesets/imports.xml
-
-
- CodeNarc - Ruleset rulesets/unused.xml
-
-
- Data flowGroovy
-
-
- Declaration redundancyGroovy
-
-
- Error handlingGroovy
-
-
- GSPGrailsGroovy
-
-
- GrailsGroovy
-
-
- Groovy
-
-
-
-
- YAML
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sa-train.iws b/sa-train.iws
deleted file mode 100644
index 85fa715..0000000
--- a/sa-train.iws
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1579390699450
-
-
- 1579390699450
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sa-train.sh b/sa-train.sh
index 609a228..957066c 100755
--- a/sa-train.sh
+++ b/sa-train.sh
@@ -6,7 +6,7 @@ fi
if [ -r /etc/sa-train.conf ]; then
while read -r name value; do
- if [[ ! "$name" =~ "$\w*#" ]]; then
+ if [[ -n "$name" && ! "$name" =~ "$\w*#" ]]; then
typeset "$name=$value"
fi
done < /etc/sa-train.conf
diff --git a/sa-train.spec b/sa-train.spec
index 4e5c3f5..03a2bed 100644
--- a/sa-train.spec
+++ b/sa-train.spec
@@ -3,13 +3,12 @@ Version: 1.0.0
Release: 1%{?dist}
Summary: Run sa-learn on all mailbox folders for users that are members of the certain group.
-
License: GPL-v3
URL: https://github.com/danieldemus/sa-train
Source0: https://github.com/danieldemus/sa-train/archive/master.zip
-BuildRequires:
-Requires:
+Requires: sudo coreutils findutils spamassassin
+BuildArch: noarch
%description
A bash script and systemd setup that run sa-learn on all mailbox folders for users that
@@ -28,12 +27,14 @@ All the specific names can be configured.
%install
rm -rf %{buildroot}
-
+
mkdir -p %{buildroot}%{_bindir} \
- %{buildroot}%{_sysconfdir}/ \
- %{buildroot}%{_unitdir} \
- %{buildroot}%{_pkgdocdir}
-
+ %{buildroot}%{_sysconfdir}/ \
+ %{buildroot}%{_unitdir} \
+ %{buildroot}%{_pkgdocdir} \
+ %{buildroot}%{_sysusersdir}
+
+cd sa-train-master
install sa-train.sh %{buildroot}%{_bindir}/sa-train.sh
install sa-train-user.sh %{buildroot}%{_bindir}/sa-train-user.sh
@@ -42,15 +43,15 @@ install -m644 README.md %{buildroot}%{_pkgdocdir}
#Config file
install sa-train.conf %{buildroot}%{_sysconfdir}/sa-train.conf
-
+
# Systemd
install -m644 sa-train.service %{buildroot}%{_unitdir}/%{name}.service
install -m644 sa-train.timer %{buildroot}%{_unitdir}/%{name}.timer
install -m644 sa-train.target %{buildroot}%{_unitdir}/%{name}.target
-
+
#install systemd sysuser file
-install -Dpm 644 sa-train-user.conf %{buildroot}%{_sysusersdir}/%{name}.conf
-
+install -Dpm 644 sa-train-group.conf %{buildroot}%{_sysusersdir}/
+
%post
%systemd_post sa-learn.timer
@@ -66,13 +67,13 @@ install -Dpm 644 sa-train-user.conf %{buildroot}%{_sysusersdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/sa-train.conf
%defattr(-,root,root,-)
-%{_sysusersdir}/sa-train.conf
+%{_sysusersdir}/sa-train-group.conf
%{_bindir}/sa-train.sh
%{_bindir}/sa-train-user.sh
%{_unitdir}/sa-train.service
%{_unitdir}/sa-train.target
%{_unitdir}/sa-train.timer
-
+
%changelog
* Sat Jan 18 2020 Daniel Demus
- Initial release