feat: add --local-annotations-dir support for dynamic annotation loading

- Resolved merge conflicts between remote and local

Signed-off-by: Divik Chotani [email protected]
Signed-off-by: Divik Chotani <[email protected]>

evaluation/intro/hello-world.sh

@@ -1,7 +1,7 @@
 [ $(uname) = 'Darwin' ] && a=/usr/share/dict/web2 || a=/usr/share/dict/words
 
 if [ -f $a ]; then
-  cat $a $a $a $a $a $a $a $a | grep '\(.\).*\1\(.\).*\2\(.\).*\3\(.\).*\4' | wc -l
+  cat-wrapper $a $a $a $a $a $a $a $a | grep '\(.\).*\1\(.\).*\2\(.\).*\3\(.\).*\4' | wc -l
 else
   echo "Dictionary file $a not found.."
 fi

pa.sh

@@ -44,21 +44,6 @@ if [ "$#" -eq 1 ] && [ "$1" = "--init" ]; then
 fi
 
 
-##This will check if use-local was passed in as a flag, and appropriately use the correct annotations library
-for arg in "$@"; do
-    if [ "$arg" == "--local-annotations" ]; then
-        sed -i 's/^pash-annotations.*/#&/' $PASH_TOP/requirements.txt
-        skip_flag=1
-	export PYTHONPATH="$ANNOTATIONS_PATH:$PYTHONPATH"
-	continue
-    fi
-    parsed_args+=("$arg")
-done
-
-if [ "$skip_flag" -eq 0 ]; then
-    sed -i "s|-e $ANNOTATIONS_PATH|#-e $ANNOTATIONS_PATH|" $PASH_TOP/requirements.txt
-fi
-cat $PASH_TOP/requirements.txt
 if ! command -v python3 &> /dev/null
 then
     echo "Python >=3 could not be found"