diff --git a/.environment.d/nas.env b/.environment.d/01_nas.env similarity index 100% rename from .environment.d/nas.env rename to .environment.d/01_nas.env diff --git a/.zsh_functions/insta.zsh b/.zsh_functions/insta.zsh index efb1e9f..a0f2503 100644 --- a/.zsh_functions/insta.zsh +++ b/.zsh_functions/insta.zsh @@ -1,75 +1,75 @@ insta () { - local cwd=$(pwd) - check_smb_mount () { - /sbin/mount | grep -q "$insta_mount_point" - } + local cwd=$(pwd) + check_smb_mount () { + /sbin/mount | grep -q "$insta_mount_point" + } - local stories_only=false - local user_list=() - while [[ $# -gt 0 ]] - do - case "$1" in - --cron) - local random_wait=$((RANDOM % 1800)) - echo "--------------------------------------------" - echo "Waiting for $((random_wait / 60)) minutes..." - sleep $random_wait - stories_only=true - ;; - --stories) - stories_only=true - ;; - *) - user_list+=("$1") - ;; - esac - shift - done + local stories_only=false + local user_list=() + while [[ $# -gt 0 ]] + do + case "$1" in + --cron) + local random_wait=$((RANDOM % 1800)) + echo "--------------------------------------------" + echo "Waiting for $((random_wait / 60)) minutes..." + sleep $random_wait + stories_only=true + ;; + --stories) + stories_only=true + ;; + *) + user_list+=("$1") + ;; + esac + shift + done - echo "-----$(date)------" + echo "-----$(date)------" - local is_local_nas=false - if [[ "$NAS_IP" == "127.0.0.1" || "$NAS_IP" == "localhost" ]]; then - is_local_nas=true - fi + local is_local_nas=false + if [[ "$NAS_IP" == "127.0.0.1" || "$NAS_IP" == "localhost" ]]; then + is_local_nas=true + fi - if [ ! -d "$insta_mount_point" ]; then - echo "Creating mount point directory..." - mkdir -p "$insta_mount_point" - fi + if [ ! -d "$insta_mount_point" ]; then + echo "Creating mount point directory..." + mkdir -p "$insta_mount_point" + fi - if ! $is_local_nas; then - if ! check_smb_mount; then - echo "Mounting SMB share..." - /sbin/mount_smbfs "smb://janolehuebner:$(pass sudo-lana 2>/dev/null)@$insta_share_on_nas" "$insta_mount_point" - fi - if ! check_smb_mount; then - echo "Failed to mount SMB share. Exiting." - return 1 - fi - fi + if ! $is_local_nas; then + if ! check_smb_mount; then + echo "Mounting SMB share..." + /sbin/mount_smbfs "smb://janolehuebner:$(pass sudo-lana 2>/dev/null)@$insta_share_on_nas" "$insta_mount_point" + fi + if ! check_smb_mount; then + echo "Failed to mount SMB share. Exiting." + return 1 + fi + fi - cd "$insta_mount_point/$insta_path_on_nas" || return 1 + cd "$insta_mount_point/$insta_path_on_nas" || return 1 - if [[ ${#user_list[@]} -eq 0 ]]; then - user_list=("${insta_default_users[@]}") - fi + if [[ ${#user_list[@]} -eq 0 ]]; then + user_list=("${insta_default_users[@]}") + fi - local cmd=(uvx --with browser_cookie3 instaloader -b Safari -B "$insta_cookiefile" "${user_list[@]}" --fast-update) - if $stories_only; then - cmd+=(--stories --no-profile-pic --no-posts) - else - cmd+=(--stories --reels) - fi + local cmd=(uvx --with browser_cookie3 instaloader -b Safari "${user_list[@]}" --fast-update) + if $stories_only; then + cmd+=(--stories --no-profile-pic --no-posts) + else + cmd+=(--stories --reels) + fi - "${cmd[@]}" + "${cmd[@]}" - if ! $is_local_nas; then - echo "Unmounting SMB share..." - sleep 3 - /sbin/umount -f "$insta_mount_point" - fi + if ! $is_local_nas; then + echo "Unmounting SMB share..." + sleep 3 + /sbin/umount -f "$insta_mount_point" + fi - cd "$cwd" + cd "$cwd" }