diff --git a/selected2folder/install.sh b/selected2folder/install.sh index 43784df6f3257fcab5eb05e3f615ba227d6a87b4..972c26692fea40b6dcbab58a4ecaec02632b2384 100755 --- a/selected2folder/install.sh +++ b/selected2folder/install.sh @@ -1,13 +1,41 @@ #!/bin/bash -dest_folder='' +log_file='./log' +dest_folder=$HOME/.local/share/kio/servicemenus/ desktop_filename='./s2fLocalization.sh ./selected2folder.desktop ./selected2folder.sh' +action=$1 -kf5-config &> /dev/null -if [ $? -eq 0 ]; then - dest_folder=$(kf5-config --path services | cut -f 1 -d ':')ServiceMenus + +echo '[=] Starting procedure from install.sh' | tee $log_file +if [ $# -eq 0 ]; then + echo '[>] No --install or --uninstall parameter given, default to --install' | tee -a $log_file + action='--install' +fi +echo "[*] N. Parameters: $#" | tee -a $log_file + +if [ -d "$dest_folder" ]; then + echo "[*] Destination path: $dest_folder" | tee -a $log_file else - dest_folder=$(kde4-config --path services | cut -f 1 -d ':')ServiceMenus + mkdir -p "$dest_folder" + echo "[V] Destination path created: $dest_folder" | tee -a $log_file fi -cp -f $desktop_filename "$dest_folder" +echo "[*] Parameter: $action" | tee -a $log_file +case "$action" in +'--install'|'--local'|'--local-install') + echo "[>] Installing: $desktop_filename" | tee -a $log_file + cp -f $desktop_filename "$dest_folder/" + echo '[V] Service Menu installed!' | tee -a $log_file + cd $dest_folder + chmod +x $desktop_filename +;; +'--uninstall'|'--remove'|'--delete'|'--deinstall') + echo "[>] Uninstalling $desktop_filename" | tee -a $log_file + cd $dest_folder + rm -f $desktop_filename +;; +*) + echo "[X] Unrecognized command" | tee -a $log_file + exit 1 +;; +esac diff --git a/selected2folder/s2fLocalization.sh b/selected2folder/s2fLocalization.sh index 13f03508a669a549193af92e93695c781633ffaf..6174e4453fb3a5f8913bc6ac290162c88d66b92a 100644 --- a/selected2folder/s2fLocalization.sh +++ b/selected2folder/s2fLocalization.sh @@ -53,7 +53,6 @@ function window_message() { esac } -#Standart system name for new folder function def_name() { case "$first_locale" in "ru") diff --git a/selected2folder/selected2folder.desktop b/selected2folder/selected2folder.desktop index da46a4ed8be5995d0f596959ce9ce7a04ed8b9dd..9266e46ac5d083857560ee3ea0586eae816487e0 100644 --- a/selected2folder/selected2folder.desktop +++ b/selected2folder/selected2folder.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Type=Service X-KDE-ServiceTypes=KonqPopupMenu/Plugin +#X-KDE-Submenu=KDE-Services +#X-KDE-Priority=TopLevel MimeType=all/all; Actions=selected2newfolder Icon=folder-bookmark @@ -16,5 +18,5 @@ Name[de]=Ordner von ausgewählt erstellen Name[fr]=Créer un dossier de la sélection Name[it]=Crea cartella da selezionata Name[es]=Crear carpeta de seleccionado -Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F . +Exec=$HOME/.local/share/kio/servicemenus/selected2folder.sh %F . Icon=folder-add diff --git a/selected2folder/selected2folder.sh b/selected2folder/selected2folder.sh index 1c860926dc7ef649743b5a193c2ec61e4f035211..d4ee14267a191c68d631dade12c0360b0ef6b93d 100755 --- a/selected2folder/selected2folder.sh +++ b/selected2folder/selected2folder.sh @@ -1,6 +1,6 @@ #!/bin/bash # ver 1.0 -. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh +. $HOME/.local/share/kio/servicemenus/s2fLocalization.sh function add_prefix_name() { NUM=0 diff --git a/selected2folder/uninstall.sh b/selected2folder/uninstall.sh deleted file mode 100755 index 3ac34c72734dcfed897636a14d8337354aeeb490..0000000000000000000000000000000000000000 --- a/selected2folder/uninstall.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -dest_folder='' -desktop_filename='./s2fLocalization.sh ./selected2folder.desktop ./selected2folder.sh' - -kf5-config &> /dev/null -if [ $? -eq 0 ]; then - dest_folder=$(kf5-config --path services | cut -f 1 -d ':')ServiceMenus -else - dest_folder=$(kde4-config --path services | cut -f 1 -d ':')ServiceMenus -fi - -cd $dest_folder -rm -f $desktop_filename