added thing?

:

do-daily-btrfs-snapshot.sh

@@ -2,7 +2,7 @@
 
 
 ###############################################################################
-# do-daily-backup.sh                                                          #
+# do-daily-btrfs-snapshot.sh                                                  #
 ###############################################################################
 # This script is my attempt at replicating the same function that timeshift   #
 # performs. This is a very simplified script to handle automated btrfs        #
@@ -26,9 +26,9 @@
 # BEGIN: Variables
 
 ## Reusable vars
-DATE=`date +%Y-%m-%d`
+DATE=$(date +%Y-%m-%d)
 ### Getting the name of the script (as it will be the first thing passed to bash when executing)
-SCRIPT=`basename $0` 
+SCRIPT=$(basename $0)
 BACKUP_DIR=/.backups
 ### Setting dir to house log files
 LOG_DIR=/var/log/$SCRIPT
@@ -57,7 +57,7 @@ function handle_logs() {
 	cd $LOG_DIR
 	echo "Began Handling logs at: $(date)"
 	local ARCHIVE_FILE=archive.tar.gz
-	local ARCHIVE_FILE_UNZIPED=${ARCHIVE_FILE%.gz}
+	local ARCHIVE_FILE_UNZIPPED=${ARCHIVE_FILE%.gz}
 
 	if [[ -f $ARCHIVE_FILE ]]; then
 		## Decompressing archive in case it exists
@@ -82,11 +82,11 @@ function handle_logs() {
 
 	echo "Adding archived logs to archive"
 	## Updating archive
-	tar uvf $ARCHIVE_FILE_UNZIPED ${FILES_TO_ARCHIVE[@]}
+	tar uvf $ARCHIVE_FILE_UNZIPPED ${FILES_TO_ARCHIVE[@]}
 
 	## Compressing Archive
 	echo "Compressing Archive"
-	gzip $ARCHIVE_FILE_UNZIPED
+	gzip $ARCHIVE_FILE_UNZIPPED
 
 	## Removing archived logs
 	echo "Removing archived files"
@@ -154,7 +154,7 @@ for SUBVOL_INFO in ${SUBVOLS[@]}; do
 	if [[ ! -d $SNAPSHOT ]]; then
 		/usr/sbin/btrfs subvol snapshot -r $DIR $SNAPSHOT
 	else
-		echo "$SNAPSHOT already existed. Not backing up"
+		echo "$SNAPSHOT already existed. Not doing a snapshot"
 	fi
 done
 

install-discord-linux.rb

@@ -0,0 +1,345 @@
+#!/usr/bin/env ruby
+
+# BEGIN: Includes & Requires
+
+require 'erb'
+require 'time'
+require 'json'
+require 'zlib'
+require 'find'
+require 'English'
+require 'net/http'
+require 'optparse'
+require 'fileutils'
+require 'rubygems/package'
+
+# END: Includes & Requires
+
+
+
+
+
+# BEGIN: Overrides
+
+class Dir
+  def / (path)
+    output_path = File.join(self.path + '/' + path)
+    if File.directory? output_path
+      Dir.new(output_path)
+    else
+      output_path
+    end
+  end
+
+  alias to_s path
+
+  ## For backwards compat
+  def chdir(dir = nil, &block)
+    if dir.nil?
+      Dir.chdir(self, &block)
+    else
+      Dir.chdir(dir, &block)
+    end
+  end
+end
+
+class String
+  def / (other)
+    File.join(self, other)
+  end
+end
+
+# END: Overrides
+
+
+
+# BEGIN: Variables
+URL_DOWNLOAD_BASE='https://dl.discordapp.net/apps/linux/{VERSION}/discord-{VERSION}.tar.gz'
+DOWNLOAD_URL='https://discord.com/api/download/stable?platform=linux&format=tar.gz'
+
+$CONFIG = Hash.new
+$CONFIG[:icon_dir] = Dir.new(Dir.home) / '.local' / 'share' / 'icons'
+File.mkdir($CONFIG[:icon_dir]) if not File.exist?($CONFIG[:icon_dir])
+$CONFIG[:discord_config_path] = Dir.new(Dir.home) / '.config' / 'discord'
+$CONFIG[:local_application_install_dir] = Dir.new(Dir.home) / '.local' / 'share' / 'applications'
+File.mkdir($CONFIG[:local_application_install_dir]) if not File.exist?($CONFIG[:local_application_install_dir])
+$CONFIG[:install_dir] = Dir.new(Dir.home) / '.opt'
+$CONFIG[:desktop_path] = $CONFIG[:install_dir] / 'Discord' / 'discord.desktop'
+File.mkdir($CONFIG[:install_dir]) if not File.exist?($CONFIG[:install_dir])
+$CONFIG[:discord_path] = $CONFIG[:install_dir] / 'Discord'
+$CONFIG[:desktop_file_path] = $CONFIG[:local_application_install_dir] / 'discord.desktop'
+$CONFIG[:discord_version_file] = $CONFIG[:discord_path] / 'resources' / 'build_info.json'
+$CONFIG[:action] = 'install'
+$CONFIG[:keep_installer] = false
+$CONFIG[:debug] = false
+DISCORD_DESKTOP_TEMPLATE = ERB.new(<<ERB, trim_mode:'-')
+[Desktop Entry]
+Name=Discord
+StartupWMClass=discord
+Comment=All-in-one voice and text chat for gamers that's free, secure, and works on both your desktop and phone.
+GenericName=Internet Messenger
+Exec=<%= $CONFIG[:discord_path] %>/Discord
+Icon=discord
+Type=Application
+Categories=Network;InstantMessaging;
+Path=<%= $CONFIG[:discord_path] %>
+ERB
+# END: Variables
+
+
+
+# BEGIN: Handle CLI ARgs
+
+OptionParser.new do |parser|
+  parser.banner = "#{ File.basename($0) } [action]"
+  parser.separator ""
+  parser.separator "  Actions"
+  parser.separator "------------------------------------------------------------------------"
+
+  parser.on('-c', '--check', "Check and report installed & remote versions") do 
+    $CONFIG[:action] = 'check'
+  end
+
+  parser.on('-i', '--install', "Check for & Install new version of discord (default)") do 
+    $CONFIG[:action] = 'install'
+  end
+
+  parser.on('-u', '--uninstall', "Uninstall Discord (not-implemented)") do 
+    $CONFIG[:action] = 'uninstall'
+    $CONFIG[:backup_filename] = Dir.home / 'discord-backup-' + Time.now.strftime('%Y-%m-%d') + '.tar.gz'
+  end
+
+  parser.on('-b', '--backup [FILENAME]', "Backup Discord Installation") do |backup_filename|
+    $CONFIG[:action] = 'backup'
+    if backup_filename.nil?
+      $CONFIG[:backup_filename] = Dir.home / 'discord-backup-' + Time.now.strftime('%Y-%m-%d') + '.tar.gz'
+    else
+      $CONFIG[:backup_filename] = backup_filename + ".tar.gz"
+    end
+  end
+
+  parser.on('--update-desktop', "Update desktop file"){
+    $CONFIG[:action] = 'update-desktop'
+  }
+
+  parser.separator ""
+  parser.separator "  General Flags"
+  parser.separator "------------------------------------------------------------------------"
+  parser.on('-h', '--help', "Show this help output") do 
+    puts parser
+    exit
+  end
+
+  parser.on('-d', '--debug', "Turn on debug logging") do 
+    $CONFIG[:debug] = true
+  end
+
+  parser.on('--keep', "Keep discord tar.gz file (default: #{$CONFIG[:keep_installer].to_s})") do 
+    $CONFIG[:keep_installer] = true
+  end
+
+end.parse!
+
+# BEGIN: Handle CLI ARgs
+
+
+
+# BEGIN: Helper Classes
+class DesktopFile
+  @@file = File.open($CONFIG[:desktop_path])
+  @@installed_file = File.open($CONFIG[:desktop_file_path])
+
+  def needs_update?
+    @@installed_file.read() != contents 
+  end
+
+  def update
+    if needs_update?
+      File.open(@@file, 'w') do |file|
+        puts "Updating Desktop File, changes are needed"
+        file.write(contents)
+      end
+
+      puts "update_desktop_file: Triggering desktop to install new desktop entry and refresh entries"
+      %x[ desktop-file-install --dir=#{$CONFIG[:local_application_install_dir]} #{$CONFIG[:desktop_path]} ]
+    else
+      puts "Not updating file. Changes not needed"
+    end
+  end
+end
+DISCORD_DESKTOP_TEMPLATE.def_method(DesktopFile, 'contents')
+
+class Installer
+  URL_DOWNLOAD_BASE='https://dl.discordapp.net/apps/linux/{VERSION}/discord-{VERSION}.tar.gz'
+  DOWNLOAD_URL='https://discord.com/api/download/stable?platform=linux&format=tar.gz'
+  @@desktop_file = DesktopFile.new
+
+  def needs_update?
+    local_version < remote_version
+  end
+
+  def remote_version
+    if @remote_version.nil?
+      uri = URI(DOWNLOAD_URL)
+      response = Net::HTTP.get(uri)
+      if response =~ /discord-(?<version>\d+\.\d+\.\d+).tar.gz/
+        @remote_version = Gem::Version.new($LAST_MATCH_INFO['version'])
+      else
+        raise "Failed to retrieve remote version"
+      end
+    end
+    @remote_version
+  end
+
+  def local_version
+    if @local_version.nil?
+      @local_version = if File.exist? $CONFIG[:discord_version_file]
+        data = JSON.load_file($CONFIG[:discord_version_file])
+        Gem::Version.new(data['version'])
+      else
+        Gem::Version.new('0.0.0')
+      end
+    end
+    @local_version 
+  end
+
+  def download
+    version = self.remote_version.to_s
+    uri = URI(URL_DOWNLOAD_BASE.gsub('{VERSION}',version))
+    puts "download_installer: Downloading The discord #{version} tar.gz"
+    file_contents = Net::HTTP.get(uri)
+    output_file = "discord-#{version}.tar.gz"
+    puts "download_installer: Output file will #{output_file}"
+    $CONFIG[:install_dir].chdir do 
+      File.open(output_file, 'wb') do |file|
+        file.write(file_contents)
+      end
+    end
+    puts "download_installer: tar.gz was downloaded"
+  end
+
+  def install
+    installer_file = "discord-#{self.remote_version}.tar.gz"
+    puts "do_install: Extracting new installer"
+    $CONFIG[:install_dir].chdir do 
+      File.open(installer_file, 'rb') do |file|
+        Gem::Package.new("").extract_tar_gz(file, $CONFIG[:install_dir])
+      end
+
+      if not $CONFIG[:keep_installer]
+        puts "do_install: Removing new installer (#{installer_file})"
+        File.unlink(installer_file)
+      end
+    end
+
+    @@desktop_file.update
+  end
+end
+
+
+# END: Helper Classes
+
+
+
+# BEGIN: Helper Functions
+
+def make_backup
+  files = {
+    files: Array.new,
+    dirs: Array.new,
+    symlinks: Array.new
+  }
+
+  [ $CONFIG[:discord_config_path].path, $CONFIG[:discord_path].path ].each do |backup_dir|
+    puts "make_backup: Getting Files from #{backup_dir})"
+    Find.find("#{backup_dir}").each{ |item| 
+      puts("#{item} was retrieved from #{backup_dir}") if $CONFIG[:debug]
+      if File.file?(item) 
+        puts("#{item} was found to be a file") if $CONFIG[:debug]
+        files[:files] << item
+      elsif File.symlink?(item)
+        puts("#{item} was found to be a symlink") if $CONFIG[:debug]
+        files[:symlinks] << item
+      elsif File.directory?(item)
+        puts("#{item} was found to be a directory") if $CONFIG[:debug]
+        files[:dirs] << item
+      end
+    }
+  end
+
+  Dir.chdir(Dir.home) do 
+    puts "make_backup: Beginning backup process (OUTPUT_FILE = #{$CONFIG[:backup_filename]})"
+    File.open($CONFIG[:backup_filename], "wb") do |backup_file|
+      Zlib::GzipWriter.wrap(backup_file) do |gzip|
+        Gem::Package::TarWriter.new(gzip) do |tar|
+
+          puts "\nmake_backup : files : Beginning backup process for files (Count: #{files[:files].count})"
+          file_count = files[:files].count
+          files[:files].each_with_index { |file, i|
+            puts "make_backup : files : Backing up #{file} (#{i+1}/#{file_count})" if $CONFIG[:debug]
+            File.open(file, 'rb') { |file_to_archive|
+              contents = file_to_archive.read()
+              tar.add_file_simple(file_to_archive.path.sub("#{Dir.home}/",''), file_to_archive.stat.mode, contents.length) { |io|
+                io.write(contents)
+              }
+            }
+          }
+
+          puts "\nmake_backup : directories : Beginning backup process for directories (Count: #{files[:dirs].count})"
+          dir_count = files[:dirs].count
+          files[:dirs].each_with_index {|dir,i|
+            puts "make_backup : directories : Backing up #{dir} (#{i+1}/#{dir_count})" if $CONFIG[:debug]
+            tar.mkdir(dir.sub("#{Dir.home}/",""), File.stat(dir).mode)
+          }
+
+          puts "\nmake_backup : symlinks : Beginning backup process for symlinks (Count: #{files[:symlinks].count})"
+          symlink_count = files[:symlinks].count
+          files[:symlinks].each_with_index {|symlink,i|
+            puts "make_backup : symlinks : Backing up #{symlink} (#{i+1}/#{symlink_count})" if $CONFIG[:debug]
+            tar.add_symlink(symlink.sub("#{Dir.home}/",""), File.readlink(symlink), File.lstat(symlink).mode)
+          }
+
+        end
+      end
+    end
+  end
+
+end
+
+# END: Helper Functions
+
+
+
+# BEGIN: Work
+
+installer = Installer.new
+case $CONFIG[:action]
+
+  when 'install'
+    if installer.needs_update?
+      puts "main: Installed Version will be updated"
+      installer.download
+      installer.install
+    elsif installer.local_version == installer.remote_version
+      puts "main: Installed Version is up-to-date"
+    else
+      puts "main: What?"
+    end
+
+  when 'check'
+    puts
+    puts "  Report"
+    puts "-------------------------------------"
+    puts "  Remote Version: #{installer.remote_version.to_s}"
+    puts "   Local Version: #{installer.local_version.to_s}"
+    puts "  Needs Updating: #{installer.needs_update? ? "Yes" : "No"}"
+
+  when 'backup'
+    make_backup
+
+  when 'update-desktop'
+    DesktopFile.new.update
+
+end
+
+# END: Work