Skip to content

Commit

Permalink
remove quiet from unsquash fs and ensure jq
Browse files Browse the repository at this point in the history
  • Loading branch information
megamaced committed Mar 8, 2021
1 parent 85db3c7 commit a58a85f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion spotify-easyrpm
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ fi

f_extract_snap() {
echo "Extracting snap and preparing"
unsquashfs -q -d "${V_SNAP_EXTRACT_DIR}" "${V_SOURCES_DIR}"/"${V_HTTP_SNAP}" || f_error "Failed to extract snap"
unsquashfs -d "${V_SNAP_EXTRACT_DIR}" "${V_SOURCES_DIR}"/"${V_HTTP_SNAP}" || f_error "Failed to extract snap"
mkdir -p "${V_SOURCES_DIR}"/"${V_PKGNAME}"/usr/{share/applications,share/doc,bin}
mv "${V_SNAP_EXTRACT_DIR}"/usr/share/spotify "${V_SOURCES_DIR}"/"${V_PKGNAME}"/usr/share
mv "${V_SNAP_EXTRACT_DIR}"/usr/bin/spotify "${V_SOURCES_DIR}"/"${V_PKGNAME}"/usr/bin
Expand Down Expand Up @@ -299,6 +299,12 @@ if ! rpm -q squashfs > /dev/null 2>&1; then
f_error "Failed to install build dependencies (squashfs). Aborting"
fi
fi
if ! rpm -q jq > /dev/null 2>&1; then
echo "Installing build dependencies (jq)"
if ! sudo zypper --non-interactive in jq; then
f_error "Failed to install build dependencies (jq). Aborting"
fi
fi
}

f_prepare_src() {
Expand Down

0 comments on commit a58a85f

Please sign in to comment.