Commit c87cfae5 authored by Alessandro Elias's avatar Alessandro Elias
Browse files

Merge branch 'rc-1.1.0-0' into 'master'

Deploy Rc 1.1.0-0 to stable

See merge request !25
parents 5d116b11 e56d8b6a
Pipeline #22686 passed with stages
in 4 minutes and 34 seconds
......@@ -11,7 +11,7 @@ lint_shell:
tags:
- debian-packaging
script:
- apt install wget
- apt update && apt install wget
- wget https://storage.googleapis.com/shellcheck/shellcheck-stable.linux.x86_64.tar.xz
- tar xf shellcheck-stable.linux.x86_64.tar.xz
- ./.linter_shell.sh
......
le-proinfodata (1.1.4) unstable; urgency=medium
* Fix postinst that also requires a second apt install command
-- Matheus Horstmann <lesuporte@c3sl.ufpr.br> Tue
le-proinfodata (1.1.3) unstable; urgency=medium
* Fix preinst that requires a second apt install command
-- Matheus Horstmann <lesuporte@c3sl.ufpr.br> Tue, 11 Nov 2019 10:00:00 -0300
le-proinfodata (1.1.2) unstable; urgency=medium
* Increase version to fix checksum
-- Matheus Horstmann <lesuporte@c3sl.ufpr.br> Tue, 22 Oct 2019 11:20:00 -0300
le-proinfodata (1.1.1) unstable; urgency=medium
* Fix CI to automatically push to repository
-- Matheus Horstmann <lesuporte@c3sl.ufpr.br> Tue, 22 Oct 2019 11:20:00 -0300
le-proinfodata (1.1.0) unstable; urgency=medium
* Trigger new simmctig agent when inep number changes
-- Matheus Horstmann <lesuporte@c3sl.ufpr.br> Tue, 22 Oct 2019 11:20:00 -0300
le-proinfodata (1.0.2) unstable; urgency=medium
* Prevents zenity from running as root (Closes: #637)
......
......@@ -94,12 +94,16 @@ if test -f "${BACKUP_DIR}/SEED2/client/conf/inep"; then
# Restore the inep and proxy files, and also their backup and md5sum
# counterparts
for FILE in "proxy" "inep"; do
[[ -e "${BACKUP_DIR}/SEED2/.backup/client/conf/${FILE}" ]] && \
cp -af "${BACKUP_DIR}/SEED2/.backup/client/conf/${FILE}" \
"${SEED_MEC_HOME}/SEED2/.backup/client/conf/${FILE}"
[[ -e "${BACKUP_DIR}/SEED2/.md5sum/client/conf/${FILE}" ]] && \
cp -af "${BACKUP_DIR}/SEED2/.md5sum/client/conf/${FILE}" \
"${SEED_MEC_HOME}/SEED2/.md5sum/client/conf/${FILE}"
[[ -e "${BACKUP_DIR}/SEED2/.md5sum/.backup/client/conf/${FILE}" ]] && \
cp -af "${BACKUP_DIR}/SEED2/.md5sum/.backup/client/conf/${FILE}" \
"${SEED_MEC_HOME}/SEED2/.md5sum/.backup/client/conf/${FILE}"
[[ -e "${BACKUP_DIR}/SEED2/client/conf/${FILE}" ]] && \
cp -af "${BACKUP_DIR}/SEED2/client/conf/${FILE}" \
"${SEED_MEC_HOME}/SEED2/client/conf/${FILE}"
done
......
......@@ -50,22 +50,22 @@ if test -f "${CONF}/inep" -a ! -f "${BKP_CONF}/inep"; then
# existence always means the other ones also exist
for FILE in "proxy" "inep"; do
if test -f "${BKPCONF}/${FILE}"; then
cp -af "${BKPCONF}/${FILE}" "${BKP_BKPCONF}/${FILE}"
[[ -e "${BKPCONF}/${FILE}" ]] && cp -af "${BKPCONF}/${FILE}" "${BKP_BKPCONF}/${FILE}"
else
cp -af "${CONF}/${FILE}" "${BKP_BKPCONF}/${FILE}"
[[ -e "${CONF}/${FILE}" ]] && cp -af "${CONF}/${FILE}" "${BKP_BKPCONF}/${FILE}"
fi
if test -f "${MD5CONF}/${FILE}"; then
cp -af "${MD5CONF}/${FILE}" "${BKP_MD5CONF}/${FILE}"
[[ -e "${MD5CONF}/${FILE}" ]] && cp -af "${MD5CONF}/${FILE}" "${BKP_MD5CONF}/${FILE}"
else
md5sum "${CONF}/${FILE}" | cut -d' ' -f1 > "${BKP_MD5CONF}/${FILE}"
fi
if test -f "${MD5BKPCONF}/${FILE}"; then
cp -af "${MD5BKPCONF}/${FILE}" "${BKP_MD5BKPCONF}/${FILE}"
[[ -e "${MD5BKPCONF}/${FILE}" ]] && cp -af "${MD5BKPCONF}/${FILE}" "${BKP_MD5BKPCONF}/${FILE}"
else
md5sum "${CONF}/${FILE}" | cut -d' ' -f1 > \
md5sum "${CONF}/${FILE}" | cut -d' ' -f1 > \
"${BKP_MD5BKPCONF}/${FILE}"
fi
cp -af "${CONF}/${FILE}" "${BKP_CONF}/${FILE}"
[[ -e "${CONF}/${FILE}" ]] && cp -af "${CONF}/${FILE}" "${BKP_CONF}/${FILE}"
done
fi
......
......@@ -22,7 +22,6 @@
# shellcheck disable=SC2089
# shellcheck disable=SC2181
# shellcheck disable=SC1117
TEXT="quero digitar o INEP da minha escola depois"
SEED_HOME="/opt/seed_mec/SEED2"
F_INEP="${SEED_HOME}/client/conf/inep"
......@@ -64,6 +63,9 @@ function verify_inep() {
if [ $? -eq 0 ];then
echo "$sch_inep" > "$inep_file"
if [ -x /opt/agentC3SL/le-agent-simmctic-reconf-inep.sh ]; then
/opt/agentC3SL/le-agent-simmctic-reconf-inep.sh
fi
return 0
else
# Check INEP is valid but not what the user expected
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment