From 1ce27e7fa4be72b68290639fb24dd5efc2b3a79e Mon Sep 17 00:00:00 2001
From: dgsga <181612+dgsga@users.noreply.github.com>
Date: Mon, 20 Jan 2020 20:45:34 +0000
Subject: [PATCH] More path/filename changes

---
 .../bin/AFP2_mount_vars                       |   0
 .../Contents/Info.plist                       | Bin
 .../Contents/MacOS/afpfs-ng-OSX.mount_cmd     | Bin
 .../Contents/Resources/AppSettings.plist      | Bin
 .../Contents/Resources/MainMenu.nib           | Bin
 .../Contents/Resources/appIcon.icns           | Bin
 .../Contents/Resources/script                 |   0
 .../Contents/Info.plist                       |   0
 .../Contents/MacOS/applet                     | Bin
 .../Contents/PkgInfo                          |   0
 .../Contents/Resources/Scripts/main.scpt      | Bin
 .../Contents/Resources/applet.icns            | Bin
 .../Contents/Resources/applet.rsrc            | Bin
 .../Resources/description.rtfd/TXT.rtf        |   0
 .../icon/logged_on_folder.icns                | Bin
 .../icon/server.icns                          | Bin
 .../icon/shared_folder.icns                   | Bin
 .../icon/shared_volume.icns                   | Bin
 .../link/AFP2 Mounts/make_dir                 |   0
 .../{afpfs-ng-OSX => afpfs-ng}/mount/make_dir |   0
 ...cmd.command => afpfs-ng.mount_cmd.command} |  12 ++++++------
 ...elect.scpt => afpfs-ng.volume_select.scpt} | Bin 28720 -> 28544 bytes
 ....command => afpfs-ng.post_install.command} |   0
 .../Unmount ALL AFP2.x volumes.scpt           | Bin 614 -> 0 bytes
 .../Mount AFP2.x volume.scpt                  | Bin 484 -> 468 bytes
 .../afpfs-ng/Unmount ALL AFP2.x volumes.scpt  | Bin 0 -> 590 bytes
 26 files changed, 6 insertions(+), 6 deletions(-)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/bin/AFP2_mount_vars (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/Info.plist (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/MacOS/afpfs-ng-OSX.mount_cmd (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/Resources/AppSettings.plist (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/Resources/MainMenu.nib (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/Resources/appIcon.icns (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app => afpfs-ng/bin/afpfs-ng.mount_cmd.app}/Contents/Resources/script (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/Info.plist (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/MacOS/applet (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/PkgInfo (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/Resources/Scripts/main.scpt (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/Resources/applet.icns (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/Resources/applet.rsrc (100%)
 rename :usr:local/{afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app => afpfs-ng/bin/afpfs-ng.volume_select.app}/Contents/Resources/description.rtfd/TXT.rtf (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/icon/logged_on_folder.icns (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/icon/server.icns (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/icon/shared_folder.icns (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/icon/shared_volume.icns (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/link/AFP2 Mounts/make_dir (100%)
 rename :usr:local/{afpfs-ng-OSX => afpfs-ng}/mount/make_dir (100%)
 rename source/{afpfs-ng-OSX.mount_cmd.command => afpfs-ng.mount_cmd.command} (50%)
 rename source/{afpfs-ng-OSX.volume_select.scpt => afpfs-ng.volume_select.scpt} (85%)
 rename source/post-installation script/{afpfs-ng-OSX.post_install.command => afpfs-ng.post_install.command} (100%)
 delete mode 100755 ~:Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt
 rename ~:Library/Scripts/{afpfs-ng-OSX => afpfs-ng}/Mount AFP2.x volume.scpt (53%)
 create mode 100755 ~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt

diff --git a/:usr:local/afpfs-ng-OSX/bin/AFP2_mount_vars b/:usr:local/afpfs-ng/bin/AFP2_mount_vars
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/AFP2_mount_vars
rename to :usr:local/afpfs-ng/bin/AFP2_mount_vars
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Info.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Info.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/AppSettings.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/AppSettings.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/MainMenu.nib
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/MainMenu.nib
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/appIcon.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/appIcon.icns
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/script
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/script
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Info.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Info.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/MacOS/applet
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/MacOS/applet
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/PkgInfo
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/PkgInfo
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/Scripts/main.scpt
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/Scripts/main.scpt
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.icns
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.rsrc
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.rsrc
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
diff --git a/:usr:local/afpfs-ng-OSX/icon/logged_on_folder.icns b/:usr:local/afpfs-ng/icon/logged_on_folder.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/logged_on_folder.icns
rename to :usr:local/afpfs-ng/icon/logged_on_folder.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/server.icns b/:usr:local/afpfs-ng/icon/server.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/server.icns
rename to :usr:local/afpfs-ng/icon/server.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/shared_folder.icns b/:usr:local/afpfs-ng/icon/shared_folder.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/shared_folder.icns
rename to :usr:local/afpfs-ng/icon/shared_folder.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/shared_volume.icns b/:usr:local/afpfs-ng/icon/shared_volume.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/shared_volume.icns
rename to :usr:local/afpfs-ng/icon/shared_volume.icns
diff --git a/:usr:local/afpfs-ng-OSX/link/AFP2 Mounts/make_dir b/:usr:local/afpfs-ng/link/AFP2 Mounts/make_dir
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/link/AFP2 Mounts/make_dir
rename to :usr:local/afpfs-ng/link/AFP2 Mounts/make_dir
diff --git a/:usr:local/afpfs-ng-OSX/mount/make_dir b/:usr:local/afpfs-ng/mount/make_dir
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/mount/make_dir
rename to :usr:local/afpfs-ng/mount/make_dir
diff --git a/source/afpfs-ng-OSX.mount_cmd.command b/source/afpfs-ng.mount_cmd.command
similarity index 50%
rename from source/afpfs-ng-OSX.mount_cmd.command
rename to source/afpfs-ng.mount_cmd.command
index a4496c3..11a8572 100755
--- a/source/afpfs-ng-OSX.mount_cmd.command
+++ b/source/afpfs-ng.mount_cmd.command
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 # only run commands if mount variables file is not empty (contains variables)
-if [ -s /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars ]; then \
+if [ -s /usr/local/afpfs-ng/bin/AFP2_mount_vars ]; then \
 
-source /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars
-mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /usr/local/afpfs-ng-OSX/mount/"$afpMountName"
+source /usr/local/afpfs-ng/bin/AFP2_mount_vars
+mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /usr/local/afpfs-ng/mount/"$afpMountName"
 
 osascript -e 'tell application "Finder"
-make new alias to POSIX file "/usr/local/afpfs-ng-OSX/mount/'"$afpMountName"'" at POSIX file "/usr/local/afpfs-ng-OSX/link/AFP2 Mounts"
+make new alias to POSIX file "/usr/local/afpfs-ng/mount/'"$afpMountName"'" at POSIX file "/usr/local/afpfs-ng/link/AFP2 Mounts"
 set name of result to "'"$afpMountName"'"
 end tell'
 
 # clear content of mount variables file
-> /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars
+> /usr/local/afpfs-ng/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)
+kill $(ps -ax | grep "afpfs-ng.volume_select.app" | awk '!/grep/' | cut -c 1-5)
 
 fi
diff --git a/source/afpfs-ng-OSX.volume_select.scpt b/source/afpfs-ng.volume_select.scpt
similarity index 85%
rename from source/afpfs-ng-OSX.volume_select.scpt
rename to source/afpfs-ng.volume_select.scpt
index b92d47c0da87a8d884067d54fdee4a2dba7a045b..f28537a2250d11b2f7412fe1a624bc237cfd2956 100755
GIT binary patch
delta 377
zcmdn+fU)5|;|6yQMvuw)G3t|z!WAda;JD9d1mbO8&S}Glkl1X(oyf+RH+h<%`{bkq
z_02p&?o5ntCUe9(PM#`aGWnuN!e&d+8c{(rhD3%mh5{fiX3%BGV@Th8PHQH!paQz^
z<OaRV5Ysm|>vITUQLx1EGGiFTB~J3}SPZ`Jsm#mh1y*4c-oeD|#^5k{Z={jDUT%JA
zUP*j%Zi-%FK>-630|Ot^V+O{JOiu)vo-i~_7K%!pTpwjG?8soPkds)Nmz<%Hm{yQh
zteclU`D&CkW7%ZEXhon3>CK_hyo}sV47m*13@Hqm3`LU-6Eru^i@C(e*fF^<&KMXF
rI+Jh2l`^&=@dPFxjZb7e0u_m2*JnrqYR#KGF-{n0rp#uRL>+zr4Xt(|

delta 521
zcmZp;&$!_M;|6yQ#(>EMoa*el4E_wk3=y02I2aijtx$xfaoRGXs+yd~p|V+yJD!cP
zY;v8TJ52NBgYg=h-w3)hG5(p{5aT$xRKx@>wL&Bj#@@^!S}Q7P$B@X7#!vvn#SFR(
zc?{`565@nuS~Hm?HE>B!cF?<w>YB|~`kX>|G=w-_W{gAek)M+SJ01trdn)rX1|jPJ
zdRS@m>#%etW-kVp$)S-(EV}-|5tG{^<rq6AFN;itd2KRRl!Le{gS|pdVrgD-hC*Um
zL0YkHUOHHHY?L))-Q<~3ib$$uHeZe6W#sl^$Ysc8NMXoiD4N_Lq6t&5Sv2M{Bjbe0
u{qe>yAz&EmPL_=qm>dz8%GifRrjYRtnrJLsuWW)eoXr&_yE!C5haUjW#)Luu

diff --git a/source/post-installation script/afpfs-ng-OSX.post_install.command b/source/post-installation script/afpfs-ng.post_install.command
similarity index 100%
rename from source/post-installation script/afpfs-ng-OSX.post_install.command
rename to source/post-installation script/afpfs-ng.post_install.command
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 a48218e919c21820904edc797eb3b1052c21685a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmbV~&n^Q|6vlsdrhjyF`e$b;mXa#oz=Fg=NK|4wX-nu-n-0RxBX|)DFVuJks;D}?
zAt4qlOmffp&bjyd&dE8m5hbm?wcYuZrIqFMlz>dx42OsB1PF!wSRrJ|*qcp5GWeUH
z8G9vblR$26DY;B~?TdD^vA*9hyAlCX9E#|=AE6^xB8R&rUnTG0j4nOd6Hb|@E|f5k
zkCkl_$=78M=<6iZ^zKl0n_c#G^UbZZNFZicDmD3of2hSANxviA1=iSLhgGR;ef5_p
z|6Ql0*Moml`O&jy6L9vHnkkghp_VK7`1ZmK1t&*E$k}sX&l+;nK0ob6{r<^W9K)5S
zdd;G~5(V-Vdm^y0Ju*wtMuEcL8KDN|Iv;Dv5_(#+r!o(oJ*3@?!IO@P&!(oR%beW@
bcK^qst2QEccU;7kiIV0(e@^%^9NxSGE_97t

diff --git a/~:Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt b/~:Library/Scripts/afpfs-ng/Mount AFP2.x volume.scpt
similarity index 53%
rename from ~:Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt
rename to ~:Library/Scripts/afpfs-ng/Mount AFP2.x volume.scpt
index f6d7a3acaedd3a4699e0ed7d7a5dc67e11d08abf..96c69a29812deb900bb362ec55169a91375f0a37 100755
GIT binary patch
delta 41
ucmaFDe1&;JJ!9U)217}Gh9rhehCBv+hD3%mh5{fiX3z!l(>LDYVgvyBEDF~E

delta 34
jcmcb@{DgTzJ!9R(219mT27iWNhKPw9q+!gBr??may}}92

diff --git a/~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt b/~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt
new file mode 100755
index 0000000000000000000000000000000000000000..ad1b37f040c78cf2bbc054764da7960b1054620a
GIT binary patch
literal 590
zcmb7C!A`<J6r63LNTCI89*IX1K>Py^l6WvN5fiTs6r;32STK6y6Z{bm{t)r#9S{NG
zImJZcK@*znoA+LKW?yEv=IQ2D^)g>6RgR<O0*GZqpkTmMOyDp#1C~G>G1<u4K@8^E
zcSk-Emz7O8Ea^wx^&k93{q(vnG9m$pa)(3}Zc7Erg$4D3L=FkOVTcf2#tsI^qs&aB
zPYl>?z$2C!Tj+6V6uIw)ogJr)0&FruvWvvl9x4HDsn@375vr)+0w-jj|IDM=-|08G
zyT6C}uNe(l0ZKMeSOackUM33@rYv!Qq#_{8Ov%EQ1<myQ`$5<1^*X~K07i802?c&G
zl1OCb1GdcN9Vw(`X0!a8;m{z}-r66BWAH)^9y2v$8cj0?4C?UkR20(uY01Qv$v+pG
WlNqenyEIe=o^JH{LY(Dz{QLz+JBrQ#

literal 0
HcmV?d00001