Updated helper scripts

MarcinOrlowski · Nov 30, 2020 · 402eea1 · 402eea1
1 parent b66dfac
commit 402eea1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/bin/install.sh b/bin/install.sh
@@ -9,13 +9,18 @@ fi
 
 declare -r pkg_name=$(cat src/metadata.desktop | grep X-KDE-PluginInfo-Name | awk '{split($0,a,"="); print a[2]}')
 declare -r base_name=$(echo "${pkg_name}" | awk '{cnt=split($0,a,"."); print a[cnt]}')
-declare -r plasmoid_name="${base_name}.plasmoid"
+declare -r pkg_version=$(cat "${src_dir}/metadata.desktop" | grep X-KDE-PluginInfo-Version | awk '{split($0,a,"="); print a[2]}')
+declare -r plasmoid_path="../"
+declare -r plasmoid_name="${base_name}-${pkg_version}.plasmoid"
 
 echo "PKG_NAME: ${pkg_name}"
+echo " VERSION: ${pkg_version}"
 echo "PLASMOID: ${plasmoid_name}"
 
-(cd src && zip -q -r "../${plasmoid_name}" *)
-ls -ld *.plasmoid
+pushd "${src_dir}" > /dev/null
+zip -q -r "${plasmoid_path}/${plasmoid_name}" *
+ls -ld "${plasmoid_path}/${plasmoid_name}"
+popd > /dev/null
 
 declare -r user_home_dir="$(eval echo "~${USER}")"
 if [[ -d "${user_home_dir}/.local/share/plasma/plasmoids/${pkg_name}" ]]; then

diff --git a/bin/pack.sh b/bin/pack.sh
@@ -9,11 +9,16 @@ fi
 
 declare -r pkg_name=$(cat "${src_dir}/metadata.desktop" | grep X-KDE-PluginInfo-Name | awk '{split($0,a,"="); print a[2]}')
 declare -r base_name=$(echo "${pkg_name}" | awk '{cnt=split($0,a,"."); print a[cnt]}')
-declare -r plasmoid_name="${base_name}.plasmoid"
+declare -r pkg_version=$(cat "${src_dir}/metadata.desktop" | grep X-KDE-PluginInfo-Version | awk '{split($0,a,"="); print a[2]}')
+declare -r plasmoid_path="../"
+declare -r plasmoid_name="${base_name}-${pkg_version}.plasmoid"
 
 echo "PKG_NAME: ${pkg_name}"
+echo " VERSION: ${pkg_version}"
 echo "PLASMOID: ${plasmoid_name}"
 
-(cd "${src_dir}" && zip -q -r "../${plasmoid_name}" *)
-ls -ld *.plasmoid
+pushd "${src_dir}" > /dev/null
+zip -q -r "${plasmoid_path}/${plasmoid_name}" *
+ls -ld "${plasmoid_path}/${plasmoid_name}"
+popd > /dev/null