Pull Submit

shell/assist.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#update to v0.2.3
+version_0_2_3(){
+  ((EUID)) && sudo_cmd="sudo"
+
+#copy file to path
+  if [ ! -s "/etc/udev/rules.d/11-usb-mount.rules" ]; then
+    $sudo_cmd cp /casaOS/server/shell/11-usb-mount.rules /etc/udev/rules.d/
+  fi
+
+  if [ ! -s "/casaOS/util/shell/usb-mount.sh" ]; then
+    $sudo_cmd cp /casaOS/server/shell/usb-mount.sh /casaOS/util/shell/
+    $sudo_cmd chmod +x /casaOS/util/shell/usb-mount.sh
+  fi
+  if [ ! -s "/etc/systemd/system/cp /casaOS/server/shell/usb-mount@.service" ]; then
+     $sudo_cmd cp /casaOS/server/shell/usb-mount@.service /etc/systemd/system/
+  fi
+
+
+
+
+}
+
+version_0_2_3

shell/tools.sh

@@ -60,7 +60,7 @@ show() {
 }
 
 run_external_script() {
-  show 0 "run_external_script"
+  assist.sh
 }
 
 update() {

shell/usb-mount.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# copy to /oasis/util/shell path
+# copy to /casaOS/util/shell path
 # chmod 755
 
 log="logger -t usb-mount.sh -s "
@@ -18,10 +18,10 @@ MOUNT_POINT=$(mount | grep ${DEVICE} | awk '{ print $3 }')
 
 do_mount() {
 
-  if [[ -n ${MOUNT_POINT} ]]; then
+  if [ -n "${MOUNT_POINT}" ]; then
     ${log} "Warning: ${DEVICE} is already mounted at ${MOUNT_POINT}"
     exit 1
-  fib
+  fi
 
   # Get info for this drive: $ID_FS_LABEL and $ID_FS_TYPE
   eval $(blkid -o udev ${DEVICE} | grep -i -e "ID_FS_LABEL" -e "ID_FS_TYPE")

shell/usb-mount@.service

@@ -4,5 +4,5 @@ Description=Mount USB Drive on %i
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStart=/oasis/util/shell/usb-mount.sh add %i
-ExecStop=/oasis/util/shell/usb-mount.sh remove %i
+ExecStart=/casaOS/util/shell/usb-mount.sh add %i
+ExecStop=/casaOS/util/shell/usb-mount.sh remove %i