xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-24 04:00:26 +00:00
Code Issues Releases Wiki Activity

Check the key dir early on before we start doing anything

Browse Source
This commit is contained in:
Victor Hu
2019-06-06 10:25:40 -04:00
parent ffa2ced116
commit 33411cd7c8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builddep.sh
View File

@@ -65,6 +65,14 @@ for pkg in ${REQPKG[*]}; do
fi
done
GNU_KEYDIR="$HOME/.gnupg"
MACROS=$HOME/.rpmmacros
if [[ -d ${GNU_KEYDIR} ]]; then
echo "WARNING: The gnupg key dir: $GNU_KEYDIR exists, it will be overwitten. Stop."
echo "WARNING: To continue, remove it and rerun the script."
exit 1
fi
# set grep to quiet by default
GREP="grep -q"
if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ]; then
@@ -123,15 +131,8 @@ cd $DESTDIR/xcat-dep
# add a comment to indicate the latest xcat-dep tar ball name
sed -i -e "s#REPLACE_LATEST_SNAP_LINE#The latest xcat-dep tar ball is ${DFNAME}#g" README
GNU_KEYDIR="$HOME/.gnupg"
MACROS=$HOME/.rpmmacros
if [ "$OSNAME" != "AIX" ]; then
# Get gpg keys in place
if [[ -d ${GNU_KEYDIR} ]]; then
echo "WARNING: The gnupg key dir: $GNU_KEYDIR exists, it will be overwitten. Stop."
echo "WARNING: To continue, remove it and rerun the script."
exit 1
fi
mkdir -p ${GNU_KEYDIR}
checkrc
for i in pubring.gpg secring.gpg trustdb.gpg; do