diff --git a/Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt b/Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt deleted file mode 100755 index a687d6e..0000000 Binary files a/Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt and /dev/null differ diff --git a/Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt b/Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt deleted file mode 100755 index e7845c1..0000000 Binary files a/Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt and /dev/null differ diff --git a/Library/Scripts/afpfs-ng-mac/Mount AFP2.x volume.scpt b/Library/Scripts/afpfs-ng-mac/Mount AFP2.x volume.scpt new file mode 100755 index 0000000..8e5f9e5 Binary files /dev/null and b/Library/Scripts/afpfs-ng-mac/Mount AFP2.x volume.scpt differ diff --git a/Library/Scripts/afpfs-ng-mac/Unmount ALL AFP2.x volumes.scpt b/Library/Scripts/afpfs-ng-mac/Unmount ALL AFP2.x volumes.scpt new file mode 100755 index 0000000..f2d47aa Binary files /dev/null and b/Library/Scripts/afpfs-ng-mac/Unmount ALL AFP2.x volumes.scpt differ diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script b/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script deleted file mode 100755 index 9144e05..0000000 --- a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# only run commands if mount variables file is not empty (contains variables) -if [ -s /etc/afpfs-ng-OSX/bin/AFP2_mount_vars ]; then \ - -source /etc/afpfs-ng-OSX/bin/AFP2_mount_vars -mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /etc/afpfs-ng-OSX/mount/"$afpMountName" - -osascript -e 'tell application "Finder" -make new alias to POSIX file "/etc/afpfs-ng-OSX/mount/'"$afpMountName"'" at POSIX file "/etc/afpfs-ng-OSX/link/AFP2 Mounts" -set name of result to "'"$afpMountName"'" -end tell' - -# clear content of mount variables file -> /etc/afpfs-ng-OSX/bin/AFP2_mount_vars - -sleep 2 - -# force quit volume selection app (required when first ran after system boot, probably due to bug in AppleScript) -kill $(ps -ax | grep "afpfs-ng-OSX.volume_select.app" | awk '!/grep/' | cut -c 1-5) - -fi \ No newline at end of file diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt b/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt deleted file mode 100755 index 5e36c0d..0000000 Binary files a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt and /dev/null differ diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf b/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf deleted file mode 100755 index 6424c26..0000000 --- a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf +++ /dev/null @@ -1,4 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 -{\fonttbl} -{\colortbl;\red255\green255\blue255;} -} \ No newline at end of file diff --git a/etc/afpfs-ng-OSX/bin/AFP2_mount_vars b/usr/local/afpfs-ng-mac/bin/AFP2_mount_vars similarity index 100% rename from etc/afpfs-ng-OSX/bin/AFP2_mount_vars rename to usr/local/afpfs-ng-mac/bin/AFP2_mount_vars diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Info.plist old mode 100755 new mode 100644 similarity index 67% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Info.plist index 824b037..6ce2864 Binary files a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist and b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Info.plist differ diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/MacOS/afpfs-ng-mac.mount_cmd similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/MacOS/afpfs-ng-mac.mount_cmd diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/AppSettings.plist old mode 100755 new mode 100644 similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/AppSettings.plist diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/MainMenu.nib old mode 100755 new mode 100644 similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/MainMenu.nib diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/appIcon.icns old mode 100755 new mode 100644 similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/appIcon.icns diff --git a/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/script b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/script new file mode 100755 index 0000000..11cf2c0 --- /dev/null +++ b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.mount_cmd.app/Contents/Resources/script @@ -0,0 +1,22 @@ +#!/bin/bash + +# only run commands if mount variables file is not empty (contains variables) +if [ -s /usr/local/afpfs-ng-mac/bin/AFP2_mount_vars ]; then \ + +source /usr/local/afpfs-ng-mac/bin/AFP2_mount_vars +mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /usr/local/afpfs-ng-mac/mount/"$afpMountName" + +osascript -e 'tell application "Finder" +make new alias to POSIX file "/usr/local/afpfs-ng-mac/mount/'"$afpMountName"'" at POSIX file "/usr/local/afpfs-ng-mac/link/AFP2 Mounts" +set name of result to "'"$afpMountName"'" +end tell' + +# clear content of mount variables file +> /usr/local/afpfs-ng-mac/bin/AFP2_mount_vars + +sleep 2 + +# force quit volume selection app (required when first ran after system boot, probably due to bug in AppleScript) +kill $(ps -ax | grep "afpfs-ng-mac.volume_select.app" | awk '!/grep/' | cut -c 1-5) + +fi diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Info.plist old mode 100755 new mode 100644 similarity index 82% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Info.plist index f751b76..c49624d --- a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist +++ b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Info.plist @@ -11,13 +11,15 @@ CFBundleIconFile applet CFBundleIdentifier - com.apple.ScriptEditor.id.afpfs-ng-OSX-volume-select + com.apple.ScriptEditor.id.afpfs-ng-mac-volume-select CFBundleInfoDictionaryVersion 6.0 CFBundleName - afpfs-ng-OSX.volume_select + afpfs-ng-mac.volume_select CFBundlePackageType APPL + CFBundleShortVersionString + 1.0 CFBundleSignature aplt LSMinimumSystemVersionByArchitecture @@ -36,9 +38,9 @@ name ScriptWindowState positionOfDivider - 518 + 346 savedFrame - 170 116 602 886 0 0 1280 1002 + 3 129 606 617 0 0 1024 746 selectedTabView result diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/MacOS/applet similarity index 82% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/MacOS/applet index c7c272b..4f7d67b 100755 Binary files a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet and b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/MacOS/applet differ diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/PkgInfo old mode 100755 new mode 100644 similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/PkgInfo diff --git a/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/Scripts/main.scpt b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/Scripts/main.scpt new file mode 100644 index 0000000..8702426 Binary files /dev/null and b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/Scripts/main.scpt differ diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/applet.icns old mode 100755 new mode 100644 similarity index 100% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/applet.icns diff --git a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/applet.rsrc old mode 100755 new mode 100644 similarity index 70% rename from etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc rename to usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/applet.rsrc index 3b39a08..56cb51e Binary files a/etc/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc and b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/applet.rsrc differ diff --git a/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf new file mode 100644 index 0000000..116a631 --- /dev/null +++ b/usr/local/afpfs-ng-mac/bin/afpfs-ng-mac.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf @@ -0,0 +1,4 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +{\fonttbl} +{\colortbl;\red255\green255\blue255;} +} \ No newline at end of file diff --git a/etc/afpfs-ng-OSX/icon/logged_on_folder.icns b/usr/local/afpfs-ng-mac/icon/logged_on_folder.icns similarity index 100% rename from etc/afpfs-ng-OSX/icon/logged_on_folder.icns rename to usr/local/afpfs-ng-mac/icon/logged_on_folder.icns diff --git a/etc/afpfs-ng-OSX/icon/server.icns b/usr/local/afpfs-ng-mac/icon/server.icns similarity index 100% rename from etc/afpfs-ng-OSX/icon/server.icns rename to usr/local/afpfs-ng-mac/icon/server.icns diff --git a/etc/afpfs-ng-OSX/icon/shared_folder.icns b/usr/local/afpfs-ng-mac/icon/shared_folder.icns similarity index 100% rename from etc/afpfs-ng-OSX/icon/shared_folder.icns rename to usr/local/afpfs-ng-mac/icon/shared_folder.icns diff --git a/etc/afpfs-ng-OSX/icon/shared_volume.icns b/usr/local/afpfs-ng-mac/icon/shared_volume.icns similarity index 100% rename from etc/afpfs-ng-OSX/icon/shared_volume.icns rename to usr/local/afpfs-ng-mac/icon/shared_volume.icns diff --git a/etc/afpfs-ng-OSX/link/AFP2 Mounts/make_dir b/usr/local/afpfs-ng-mac/link/AFP2 Mounts/make_dir similarity index 100% rename from etc/afpfs-ng-OSX/link/AFP2 Mounts/make_dir rename to usr/local/afpfs-ng-mac/link/AFP2 Mounts/make_dir diff --git a/etc/afpfs-ng-OSX/mount/make_dir b/usr/local/afpfs-ng-mac/mount/make_dir similarity index 100% rename from etc/afpfs-ng-OSX/mount/make_dir rename to usr/local/afpfs-ng-mac/mount/make_dir