Skip to content

Commit

Permalink
Merge pull request #30 from megamaced/develop
Browse files Browse the repository at this point in the history
Fix gpg checks and finding multiple RPMs in rpmbuild dir
  • Loading branch information
megamaced authored Apr 2, 2020
2 parents b65bf9b + 9b4df10 commit 3d5fa36
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions spotify-easyrpm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ cat <<EOF
EOF
sleep 2
cat <<EOF
VERSION: 2.1.0
VERSION: 2.1.1
SUPPORT: https://github.com/megamaced/spotify-easyrpm/issues
The latest openSUSE Leap, Tumbleweed or SLE are supported only
Expand Down Expand Up @@ -446,7 +446,7 @@ fi

f_rpm_install() {
echo "Installing ${V_PKGNAME}-${V_DEB_VER}"
if ! sudo zypper --non-interactive --no-gpg-check in "${V_RPMS_DIR}"/"${V_RPM_ARCH}"/"${V_PKGNAME}"-"${V_DEB_VER}"*"${V_RPM_ARCH}".rpm; then
if ! sudo zypper --non-interactive --no-gpg-checks in "${V_RPMS_DIR}"/"${V_RPM_ARCH}"/"${V_PKGNAME}"-"${V_DEB_VER}"*"${V_RPM_ARCH}".rpm; then
f_error "Failed to install ${V_PKGNAME}-${V_DEB_VER}"
fi
}
Expand Down Expand Up @@ -515,7 +515,7 @@ systemctl --user enable "${V_PRG_NAME}.timer"
f_update_local_repo() {
if [[ "${V_RUN_MODE}" != "clean-repo" ]]; then
echo "Moving RPMs from your rpmbuild ${V_RPMS_DIR} to your local repo ${V_LOCAL_REPO}"
find "${V_RPMS_DIR}"/"${V_RPM_ARCH}"/ -name "${V_PKGNAME}"-*"${V_RPM_ARCH}".rpm -type f -exec mv -t "${V_LOCAL_REPO}" {} \+
find "${V_RPMS_DIR}"/"${V_RPM_ARCH}"/ -name "${V_PKGNAME}-*${V_RPM_ARCH}.rpm" -type f -exec mv -t "${V_LOCAL_REPO}" {} \+
fi
if ! createrepo -q "${V_LOCAL_REPO}"; then
f_error "Failed to create / update local repo. Aborting"
Expand Down

0 comments on commit 3d5fa36

Please sign in to comment.