diff --git a/makerelease b/makerelease index c980955..4a0835f 100644 --- a/makerelease +++ b/makerelease @@ -1,8 +1,10 @@ #!/bin/bash -prjname=plasma-containmentactions-customdesktopmenu -version=$(date +"%Y.%m.%d.%H.%M.%S") -branch=$(git rev-parse --abbrev-ref HEAD) +if [ "$1" == "" ]; then + echo "Error: No version provided" + echo "./makerelease 0.0.1" + exit 1 +fi ssh -T git@github.com if [ ! "$?" = "1" ]; then @@ -10,13 +12,15 @@ if [ ! "$?" = "1" ]; then exit 1 fi -#scp "matmoul@web.sourceforge.net:/home/frs/project/$prjname/README.txt" /dev/null -#if [ ! "$?" = "0" ]; then -# echo "No Sourceforge ssh key loaded exiting..." -# exit 1 -#fi +scp "matmoul@web.sourceforge.net:/home/frs/project/plasma-custom-desktop-menu/README.txt" /dev/null +if [ ! "$?" = "0" ]; then + echo "No Sourceforge ssh key loaded exiting..." + exit 1 +fi clear +branch=$(git rev-parse --abbrev-ref HEAD) +version=$1 read -p "Current branch is $branch. Continue ? (y/N)" choice case "$choice" in n|N|'' ) @@ -35,26 +39,13 @@ echo "" echo "Finalise lib script..." sed -i /X-KDE-PluginInfo-Version/c\X-KDE-PluginInfo-Version=$version src/plasma-containmentactions-customdesktopmenu.desktop -echo "Make tar.gz file" -cp -R src plasma-containmentactions-customdesktopmenu -tar -zcvf releases/plasma-containmentactions-customdesktopmenu-$version.tar.gz plasma-containmentactions-customdesktopmenu/* -git add releases/plasma-containmentactions-customdesktopmenu-$version.tar.gz -rm -R plasma-containmentactions-customdesktopmenu - echo "Make last commit..." -git commit -a -m "New Release : $version" +git commit -a -m "Version $version" if [ ! "$branch" = "master" ]; then echo "Merge branch $branch to master..." git checkout master git merge $branch - - read -p "Delete branch $branch ? (y/N)" choice - case "$choice" in - y|Y ) - git branch -D $branch - ;; - esac fi read -p "Publish to server ? (Y/n)" choice @@ -64,19 +55,13 @@ case "$choice" in ;; esac -echo "Push release..." -git push - - - -#Sourceforge : - echo "Publish release..." -scp -r releases/plasma-containmentactions-customdesktopmenu-$version.tar.gz matmoul@web.sourceforge.net:/home/frs/project/plasma-custom-desktop-menu/releases/ - - - - +#Github +git push --tags +#Sourceforge : +wget https://github.com/MatMoul/plasma-containmentactions-customdesktopmenu/archive/v${version}.tar.gz +scp -r v${version}.tar.gz matmoul@web.sourceforge.net:/home/frs/project/plasma-custom-desktop-menu/releases/ +rm v${version}.tar.gz if [ ! "$branch" = "master" ]; then git checkout $branch diff --git a/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.17.33.44.tar.gz b/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.17.33.44.tar.gz deleted file mode 100644 index e4f7132..0000000 Binary files a/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.17.33.44.tar.gz and /dev/null differ diff --git a/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.18.13.58.tar.gz b/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.18.13.58.tar.gz deleted file mode 100644 index d3f2ebe..0000000 Binary files a/releases/plasma-containmentactions-customdesktopmenu-2015.09.06.18.13.58.tar.gz and /dev/null differ diff --git a/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.13.45.15.tar.gz b/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.13.45.15.tar.gz deleted file mode 100644 index 2793f50..0000000 Binary files a/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.13.45.15.tar.gz and /dev/null differ diff --git a/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.14.10.49.tar.gz b/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.14.10.49.tar.gz deleted file mode 100644 index 6327bcc..0000000 Binary files a/releases/plasma-containmentactions-customdesktopmenu-2016.01.20.14.10.49.tar.gz and /dev/null differ diff --git a/src/install b/src/install index c1fe3b8..76f98fa 100755 --- a/src/install +++ b/src/install @@ -3,7 +3,7 @@ rm -R -f build mkdir build cd build -installlibdir=$(dirname $(dirname $(find /usr -name plasma_containmentactions_applauncher.so))) +installlibdir=$(dirname $(find /usr -name plasma_containmentactions_contextmenu.so)) cmake -DKDE_INSTALL_LIBDIR=$installlibdir .. if [ ! "$?" = "0" ]; then