Skip to content

Commit

Permalink
Post-fix to satisfy pre-commit check
Browse files Browse the repository at this point in the history
  • Loading branch information
elenst committed Sep 28, 2024
1 parent 27dcd8f commit 91a38dd
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions scripts/bash_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -489,14 +489,14 @@ control_mariadb_server() {

store_mariadb_server_info() {
sudo mariadb --skip-column-names -e "select @@version" | awk -F'-' '{ print $1 }' >"/tmp/version.$1"
sudo mariadb --skip-column-names -e "select engine, support, transactions, savepoints from information_schema.engines order by engine" > ./engines.$1
sudo mariadb --skip-column-names -e "select plugin_name, plugin_status, plugin_type, plugin_library, plugin_license from information_schema.all_plugins order by plugin_name" > ./plugins.$1
sudo mariadb --skip-column-names -e "select engine, support, transactions, savepoints from information_schema.engines order by engine" > "./engines.$1"
sudo mariadb --skip-column-names -e "select plugin_name, plugin_status, plugin_type, plugin_library, plugin_license from information_schema.all_plugins order by plugin_name" > "./plugins.$1"
sudo mariadb --skip-column-names -e "select 'Stat' t, variable_name name, variable_value val \
from information_schema.global_status where variable_name like '%have%' \
union \
select 'Vars' t, variable_name name, variable_value val \
from information_schema.global_variables where variable_name like '%have%' \
order by t, name" > ./capabilities.$1
order by t, name" > "./capabilities.$1"
}

check_upgraded_versions() {
Expand Down Expand Up @@ -548,9 +548,9 @@ check_upgraded_versions() {
# some adjustments to them to avoid false positives, but we want original files
# to be stored by buildbot
for f in ldd-main ldd-columnstore reqs-main reqs-columnstore plugins capabilities; do
if [ -e ./${f}.old ] ; then
cp ./${f}.old ./${f}.old.cmp
cp ./${f}.new ./${f}.new.cmp
if [ -e "./${f}.old" ] ; then
cp "./${f}.old" "./${f}.old.cmp"
cp "./${f}.new" "./${f}.new.cmp"
fi
done

Expand Down Expand Up @@ -634,7 +634,7 @@ collect_dependencies() {
;;
esac

rm -f ./ldd-*.${old_or_new} ./reqs-*.${old_or_new}
rm -f "./ldd-*.${old_or_new}" "./reqs-*.${old_or_new}"
bb_log_info "Collecting dependencies for the ${old_or_new} server"

for p in ${package_list} ${spider_package_list} ; do
Expand All @@ -643,20 +643,20 @@ collect_dependencies() {
else
suffix="main"
fi
echo "-----------------" >> ./reqs-${suffix}.${old_or_new}
echo "$p:" >> ./reqs-${suffix}.${old_or_new}
echo "-----------------" >> "./reqs-${suffix}.${old_or_new}"
echo "$p:" >> "./reqs-${suffix}.${old_or_new}"
if [ "$pkgtype" == "rpm" ] ; then
rpm -q -R $p | awk '{print $1}' | grep -vE '/usr/bin/env|/usr/bin/bash' >> ./reqs-${suffix}.${old_or_new}
rpm -q -R $p | awk '{print $1}' | grep -vE '/usr/bin/env|/usr/bin/bash' >> "./reqs-${suffix}.${old_or_new}"
filelist=`rpm $NOARTIFACT -ql $p | sort`
else
sudo apt-cache depends $p --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances >> ./reqs-${suffix}.${old_or_new}
sudo apt-cache depends $p --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances >> "./reqs-${suffix}.${old_or_new}"
filelist=`dpkg-query -L $p | sort`
fi
echo "====== Package $p" >> ./ldd-${suffix}.${old_or_new}
echo "====== Package $p" >> "./ldd-${suffix}.${old_or_new}"
for f in $filelist ; do
sudo ldd $f > /dev/null 2>&1 || continue
echo "=== $f" >> ./ldd-${suffix}.${old_or_new}
sudo ldd $f | sort | sed 's/(.*)//' >> ./ldd-${suffix}.${old_or_new}
echo "=== $f" >> "./ldd-${suffix}.${old_or_new}"
sudo ldd $f | sort | sed 's/(.*)//' >> "./ldd-${suffix}.${old_or_new}"
done
done
}

0 comments on commit 91a38dd

Please sign in to comment.