fixed urls

README.md

@@ -57,7 +57,7 @@ Backup anything you don't want deleted.
 * **Warning**: Warnings signify that damage may occur
 * **Example**: Examples provide a visual reference of how a procedure would be carried out in the real world
 * `Inline code`: Inline code signifies package names, filenames, or commands
-* ```Code block```: Code blocks signify file contents
+* `Code block`: Code blocks signify file contents
 
 ## How it works
 
@@ -95,7 +95,7 @@ This section is for users who are familiar with git, a Unix-like command line en
 scripting.
 
 1. Make sure [Racket](https://racket-lang.org/) is installed
-2. `git clone https://git.m455.casa/m455/nicethings.git`
+2. `git clone git://git.m455.casa/nicethings`
 3. `cd nicethings`
 4. `sudo make install-global`
 5. `nicethings`
@@ -122,7 +122,7 @@ will need the source code to install nicethings.
 
 #### To download nicethings using git
 
-1. Run `git clone https://git.m455.casa/m455/nicethings.git`
+1. Run `git clone git://git.m455.casa/nicethings`
 
 **Note**: This will create a `nicethings` directory in your current directory.
 

src/nicethings.rkt

@@ -8,17 +8,17 @@
 ;; ------------------------------------------------
 ;; Constants
 ;; ------------------------------------------------
-(define help-command-1 "help")
-(define help-command-2 "--help")
-(define help-command-3 "-h")
-(define init-command "init")
-(define ls-command "ls")
-(define rm-command "rm")
-(define add-command "add")
+(define command-help-1 "help")
+(define command-help-2 "--help")
+(define command-help-3 "-h")
+(define command-init "init")
+(define command-ls "ls")
+(define command-rm "rm")
+(define command-add "add")
 (define program-name "nicethings")
 (define program-file (string-append "." program-name))
 (define program-path (path->string (build-path (find-system-path 'home-dir) program-file)))
-(define read-permissions 444)
+(define read-permissions 420)
 (define newline "\n")
 (define double-newline "\n\n")
 
@@ -30,13 +30,13 @@
         (format (string-append "Error: Too many arguments." newline
                                "Try running '~a ~a' for more information.")
                 program-name
-                help-command-1)
+                command-help-1)
 
         'error-incorrect-usage
         (format (string-append "Error: Incorrect usage." newline
                                "Try running '~a ~a' for more information.")
                 program-name
-                help-command-1)
+                command-help-1)
 
         'couldnt-find-file
         (format (string-append "Error: Couldn't find ~a" newline
@@ -46,7 +46,7 @@
                 program-path
                 program-path
                 program-name
-                init-command)
+                command-init)
 
         'error-something-exists
         (format "Error: It looks like ~a already exists." program-path)
@@ -56,7 +56,7 @@
                                "Try running '~a ~a'.")
                 program-path
                 program-name
-                init-command)
+                command-init)
 
         'error-item-not-found
         "Error: Item not found."
@@ -151,8 +151,8 @@
          (displayln item))))
 
 (define (ls)
-  (if (and (file-exists? program-file)
-           (has-read-permissions? program-file))
+  (if (and (file-exists? program-path)
+           (has-read-permissions? program-path))
     (let ([listof-items (file->lines program-path)])
       (if (null? listof-items)
         (displayln-messages-ref 'empty-list)
@@ -165,6 +165,7 @@
 (define (rm/remove-nicething item-number)
   (let ([listof-items (file->lines program-path)])
     (if (and (not (null? listof-items))
+             (exact? item-number)
              (>= item-number 0)
              (< item-number (length listof-items)))
       (let* ([item-to-remove (list-ref listof-items item-number)]
@@ -174,8 +175,8 @@
       (displayln-messages-ref 'error-item-not-found))))
 
 (define (rm arg)
-  (if (and (file-exists? program-file)
-           (has-read-permissions? program-file))
+  (if (and (file-exists? program-path)
+           (has-read-permissions? program-path))
     (let ([item-number (string->number arg)])
       (if item-number
         (rm/remove-nicething item-number)
@@ -186,8 +187,8 @@
 ;; add
 ;; ------------------------------------------------
 (define (add nicething)
-  (if (and (file-exists? program-file)
-           (has-read-permissions? program-file))
+  (if (and (file-exists? program-path)
+           (has-read-permissions? program-path))
     ;; The removing and adding of the '\n' is to
     ;; ensure only one '\n' exists at the end of the
     ;; item to be added.
@@ -212,8 +213,9 @@
          [list-length (length listof-nicethings)])
     (when (not (zero? list-length))
       (let* ([random-number (random list-length)]
-             [random-nicething (list-ref listof-nicethings random-number)])
-        (displayln random-nicething)))))
+             [random-nicething (list-ref listof-nicethings random-number)]
+             [nicething-trimmed (string-replace random-nicething "\n" "")])
+        (displayln nicething-trimmed)))))
 
 ;; ------------------------------------------------
 ;; help
@@ -228,29 +230,29 @@
       "Commands:" newline
       "  No command - Displays a random nicething from a random user." newline
       (format "  ~a - Creates a file in ~a, which allows you to contribute to the town-wide list of nicethings."
-              init-command
+              command-init
               program-path) newline
-      (format "  ~a - Adds a nicething to your list." add-command) newline
-      (format "  ~a - Prints a numbered list of the nicethings you've added." ls-command) newline
-      (format "  ~a - Removes a nicething from your list." rm-command)
+      (format "  ~a - Adds a nicething to your list." command-add) newline
+      (format "  ~a - Prints a numbered list of the nicethings you've added." command-ls) newline
+      (format "  ~a - Removes a nicething from your list." command-rm)
       double-newline
 
       "Examples:" newline
       (format "  ~a" program-name) newline
-      (format "  ~a ~a" program-name init-command) newline
-      (format "  ~a ~a \"You are wonderful\"" program-name add-command) newline
-      (format "  ~a ~a" program-name ls-command) newline
-      (format "  ~a ~a 2" program-name rm-command))))
+      (format "  ~a ~a" program-name command-init) newline
+      (format "  ~a ~a \"You are wonderful\"" program-name command-add) newline
+      (format "  ~a ~a" program-name command-ls) newline
+      (format "  ~a ~a 2" program-name command-rm))))
 
 (define (process-args vectorof-args)
   (match vectorof-args
-    [(or (vector (== help-command-1))
-         (vector (== help-command-2))
-         (vector (== help-command-3))) (help)]
-    [(vector (== ls-command))          (ls)]
-    [(vector (== init-command))        (init)]
-    [(vector (== add-command) a)       (add a)]
-    [(vector (== rm-command)  a)       (rm a)]
+    [(or (vector (== command-help-1))
+         (vector (== command-help-2))
+         (vector (== command-help-3))) (help)]
+    [(vector (== command-ls))          (ls)]
+    [(vector (== command-init))        (init)]
+    [(vector (== command-add) a)       (add a)]
+    [(vector (== command-rm)  a)       (rm a)]
     [_                                 (random-message)]
     [(vector _ ...)                    (displayln-messages-ref 'error-incorrect-usage)]))